Attachment 284801 Details for Bug 420751 – diffs

[patch] diffs

cvsdiffs (text/plain), 6.95 KB, created by Rich Megginson on 2007-12-11 23:46:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-12-11 23:46:09 UTC

Size: 6.95 KB

patch

obsolete

>Index: adminserver/admserv/schema/ldif/12dsconfig.mod.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/12dsconfig.mod.tmpl,v
>retrieving revision 1.1
>diff -u -8 -r1.1 12dsconfig.mod.tmpl
>--- adminserver/admserv/schema/ldif/12dsconfig.mod.tmpl	20 Jun 2007 23:50:11 -0000	1.1
>+++ adminserver/admserv/schema/ldif/12dsconfig.mod.tmpl	11 Dec 2007 23:38:04 -0000
>@@ -16,17 +16,17 @@
> # along with this program; if not, write to the Free Software
> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
> #
> # END COPYRIGHT BLOCK
> dn: cn=config
> changetype: modify
> add: aci
> aci: (targetattr="*")(version 3.0; acl "Configuration Administrators Group"; allow (all) groupdn="ldap:///cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot";)
>-aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=admin, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";)
>+aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=%as_uid%, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";)
> aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
> 
> dn: cn=SNMP,cn=config
> changetype: modify
> add: aci
> aci: (target="ldap:///cn=SNMP,cn=config")(targetattr !="aci")(version 3.0;acl "snmp";allow (read, search, compare)(userdn = "ldap:///anyone");)
> 
> dn: oid=2.16.840.1.113730.3.4.9,cn=features,cn=config
>Index: adminserver/admserv/schema/ldif/13dsschema.mod.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/13dsschema.mod.tmpl,v
>retrieving revision 1.1
>diff -u -8 -r1.1 13dsschema.mod.tmpl
>--- adminserver/admserv/schema/ldif/13dsschema.mod.tmpl	20 Jun 2007 23:50:11 -0000	1.1
>+++ adminserver/admserv/schema/ldif/13dsschema.mod.tmpl	11 Dec 2007 23:38:04 -0000
>@@ -17,10 +17,10 @@
> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
> #
> # END COPYRIGHT BLOCK
> dn: cn=schema
> changetype: modify
> add: aci
> aci: (target="ldap:///cn=schema")(targetattr !="aci")(version 3.0;acl "anonymous, no acis"; allow (read, search, compare) userdn = "ldap:///anyone";)
> aci: (targetattr="*")(version 3.0; acl "Configuration Administrators Group"; allow (all) groupdn="ldap:///cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot";)
>-aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=admin,ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";)
>+aci: (targetattr="*")(version 3.0; acl "Configuration Administrator"; allow (all) userdn="ldap:///uid=%as_uid%,ou=Administrators, ou=TopologyManagement, o=NetscapeRoot";)
> aci: (targetattr = "*")(version 3.0; acl "SIE Group"; allow (all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
>Index: adminserver/Makefile.am
>===================================================================
>RCS file: /cvs/dirsec/adminserver/Makefile.am,v
>retrieving revision 1.36
>diff -u -8 -r1.36 Makefile.am
>--- adminserver/Makefile.am	15 Nov 2007 17:02:02 -0000	1.36
>+++ adminserver/Makefile.am	11 Dec 2007 23:38:04 -0000
>@@ -154,16 +154,17 @@
> 	admserv/schema/ldif/02globalpreferences.ldif.tmpl \
> 	admserv/schema/ldif/10dsdata.ldif.tmpl \
> 	admserv/schema/ldif/10rm_dsdata.ldif.tmpl \
> 	admserv/schema/ldif/11dstasks.ldif.tmpl \
> 	admserv/schema/ldif/12dsconfig.mod.tmpl \
> 	admserv/schema/ldif/13dsschema.mod.tmpl \
> 	admserv/schema/ldif/14dsmonitor.mod.tmpl \
> 	admserv/schema/ldif/15dspta.ldif.tmpl \
>+	admserv/schema/ldif/16dssuffixadmin.mod.tmpl \
> 	admserv/schema/ldif/20asdata.ldif.tmpl \
> 	admserv/schema/ldif/21astasks.ldif.tmpl \
> 	admserv/schema/ldif/22ascommands.ldif.tmpl \
> 	admserv/schema/ldif/asmigrate.ldif.tmpl \
> 	admserv/html/admserv_phonebook.html \
> 	admserv/html/admserv_orgchart.html \
> 	admserv/html/admserv_dsgw.html
> 
>Index: adminserver/configure.ac
>===================================================================
>RCS file: /cvs/dirsec/adminserver/configure.ac,v
>retrieving revision 1.22
>diff -u -8 -r1.22 configure.ac
>--- adminserver/configure.ac	5 Oct 2007 23:48:01 -0000	1.22
>+++ adminserver/configure.ac	11 Dec 2007 23:38:04 -0000
>@@ -1,13 +1,13 @@
> #                                               -*- Autoconf -*-
> # Process this file with autoconf to produce a configure script.
> 
> AC_PREREQ(2.59)
>-AC_INIT([dirsrv-admin], [1.1.0], [http://bugzilla.redhat.com/])
>+AC_INIT([dirsrv-admin], [1.1.1], [http://bugzilla.redhat.com/])
> AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c])
> AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
> AM_MAINTAINER_MODE
> AC_CANONICAL_HOST
> 
> AC_CONFIG_HEADER([config.h])
> 
> # Checks for programs.
>Index: adminserver/admserv/newinst/src/AdminUtil.pm.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminUtil.pm.in,v
>retrieving revision 1.16
>diff -u -8 -r1.16 AdminUtil.pm.in
>--- adminserver/admserv/newinst/src/AdminUtil.pm.in	2 Oct 2007 23:35:01 -0000	1.16
>+++ adminserver/admserv/newinst/src/AdminUtil.pm.in	11 Dec 2007 23:38:04 -0000
>@@ -265,17 +265,18 @@
>         return 0;
>     }
> 
>     # add the o=NetscapeRoot tree using the mapper and ldif templates
>     my @ldiffiles = ('@ldifdir@/01nsroot.ldif.tmpl',
>                      '@ldifdir@/02globalpreferences.ldif.tmpl',
>                      '@ldifdir@/12dsconfig.mod.tmpl',
>                      '@ldifdir@/13dsschema.mod.tmpl',
>-                     '@ldifdir@/14dsmonitor.mod.tmpl'
>+                     '@ldifdir@/14dsmonitor.mod.tmpl',
>+                     '@ldifdir@/16dssuffixadmin.mod.tmpl'
>                      );
>     my $setupinf = new Inf("@infdir@/setup.inf");
>     my $admininf = new Inf("@infdir@/admin.inf");
>     my $dsinf = new Inf("@infdir@/slapd.inf");
>     my $mapper = new Inf("@infdir@/configdsroot.map");
> 
>     $mapper = process_maptbl($mapper, $errs, $inf, $dsinf, $admininf, $setupinf);
>     if (!$mapper or @{$errs}) {
>@@ -297,17 +298,18 @@
>     my $conn = shift;
>     my $inf = shift;
>     my $errs = shift;
> 
>     # add the o=NetscapeRoot tree using the mapper and ldif templates
>     my @ldiffiles = ('@ldifdir@/12dsconfig.mod.tmpl',
>                      '@ldifdir@/13dsschema.mod.tmpl',
>                      '@ldifdir@/14dsmonitor.mod.tmpl',
>-                     '@ldifdir@/15dspta.ldif.tmpl'
>+                     '@ldifdir@/15dspta.ldif.tmpl',
>+                     '@ldifdir@/16dssuffixadmin.mod.tmpl'
>                      );
>     my $setupinf = new Inf("@infdir@/setup.inf");
>     my $admininf = new Inf("@infdir@/admin.inf");
>     my $dsinf = new Inf("@infdir@/slapd.inf");
>     my $mapper = new Inf("@infdir@/dirserver.map");
> 
>     $mapper = process_maptbl($mapper, $errs, $inf, $dsinf, $admininf, $setupinf);
>     if (!$mapper or @{$errs}) {

Actions: View | Diff

Attachments on bug 420751: 284801 | 284811 | 284881