[Fedora-directory-commits] adminserver/admserv/schema/ldif 01nsroot.ldif.tmpl, 1.3, 1.4 02globalpreferences.ldif.tmpl, 1.2, 1.3 10dsdata.ldif.tmpl, 1.4, 1.5

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/adminserver/admserv/schema/ldif
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27625/admserv/schema/ldif

Modified Files:
	01nsroot.ldif.tmpl 02globalpreferences.ldif.tmpl 
	10dsdata.ldif.tmpl 
Log Message:
Resolves: #244749
Summary: Configure Pass Thru Auth (comment #8, #9)
Description: 1) Introducing BaseVersion (*.inf files) via PACKAGE_BASE_VERSION
(configure.ac) to generate #.# format version number from #.#.#.  The #.#
format version number is used in the jar file names
2) configure.ac: Changed the default prefix to the hardcoded string: AC_PREFIX_DEFAULT([/opt/fedora-ds])



Index: 01nsroot.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/01nsroot.ldif.tmpl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 01nsroot.ldif.tmpl	20 Jun 2007 23:50:11 -0000	1.3
+++ 01nsroot.ldif.tmpl	21 Jun 2007 22:01:52 -0000	1.4
@@ -24,7 +24,6 @@
 aci: (targetattr="*")(version 3.0; acl "Enable Configuration Administrator Group modification"; allow (all) groupdn="ldap:///cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot";)
 aci: (targetattr="*")(targetfilter=(o=NetscapeRoot))(version 3.0; acl "Default anonymous access"; allow (read, search) userdn="ldap:///anyone";)
 aci: (targetattr="*")(version 3.0; acl "Enable Group Expansion"; allow (read, search, compare) groupdnattr="uniquemember";)
-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: ou=TopologyManagement, o=NetscapeRoot
 objectClass: top


Index: 02globalpreferences.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/02globalpreferences.ldif.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 02globalpreferences.ldif.tmpl	20 Jun 2007 23:50:11 -0000	1.2
+++ 02globalpreferences.ldif.tmpl	21 Jun 2007 22:01:52 -0000	1.3
@@ -24,21 +24,21 @@
 ou: admin
 nsmerge: ADD_IF_EMPTY
 
-dn: ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: organizationalunit
 objectClass: extensibleObject
-ou: %as_version%
+ou: %as_baseversion%
 nsmerge: ADD_IF_EMPTY
 
-dn: cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nsResourceRef
 objectClass: extensibleObject
 cn: ResourceEditorExtension
 nsmerge: ADD_IF_EMPTY
 
-dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 cn: nsroledefinition
 objectClass: top
 objectClass: extensibleObject
@@ -50,7 +50,7 @@
 nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@%ds_console_jar%
 nsmerge: {nsclassname}MULTI_MERGE
 
-dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 cn: cossuperdefinition
 objectClass: top
 objectClass: extensibleObject
@@ -97,17 +97,17 @@
 nsmerge: {nsadminenduserhtmlindex}MULTI_MERGE
 nsmerge: {nsnickname}MULTI_MERGE
 
-dn: cn=PublicViews, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=PublicViews, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nsAdminConsoleUser
 cn: PublicViews
 
-dn: cn=CustomView, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=CustomView, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nsResourceRef
 cn: CustomView
 
-dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 cn: inetorgPerson
 objectClass: nsResourceRef
 objectClass: nsAdminResourceEditorExtension
@@ -121,7 +121,7 @@
 nsClassname: com.netscape.management.client.ug.ResEditorPosixUser
 nsmerge: {nsclassname}MULTI_MERGE
 
-dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 cn: organizationalPerson
 objectClass: nsResourceRef
 objectClass: nsAdminResourceEditorExtension
@@ -133,7 +133,7 @@
 nsClassname: com.netscape.management.client.ug.LanguagePage
 nsmerge: {nsclassname}MULTI_MERGE
 
-dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 cn: groupofuniquenames
 objectClass: nsResourceRef
 objectClass: nsAdminResourceEditorExtension
@@ -146,7 +146,7 @@
 nsClassname: com.netscape.management.client.ug.LanguagePage
 nsmerge: {nsclassname}MULTI_MERGE
 
-dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 cn: organizationalunit
 objectClass: nsResourceRef
 objectClass: nsAdminResourceEditorExtension
@@ -157,12 +157,12 @@
 nsClassname: com.netscape.management.client.ug.LanguagePage
 nsmerge: {nsclassname}MULTI_MERGE
 
-dn: cn=defaultObjectClassesContainer, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nsResourceRef
 cn: DefaultObjectClassesContainer
 
-dn: cn=user, cn=defaultObjectClassesContainer, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=user, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nsResourceRef
 objectClass: nsdefaultObjectClasses
@@ -172,7 +172,7 @@
 nsDefaultObjectClass: organizationalPerson
 nsDefaultObjectClass: inetorgperson
 
-dn: cn=group, cn=defaultObjectClassesContainer, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=group, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nsResourceRef
 objectClass: nsdefaultObjectClasses
@@ -180,7 +180,7 @@
 nsDefaultObjectClass: top
 nsDefaultObjectClass: groupofuniquenames
 
-dn: cn=ou, cn=defaultObjectClassesContainer, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=ou, cn=defaultObjectClassesContainer, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nsResourceRef
 objectClass: nsdefaultObjectClasses
@@ -188,14 +188,14 @@
 nsDefaultObjectClass: top
 nsDefaultObjectClass: organizationalunit
 
-dn: cn=topologyplugin, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=topologyplugin, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nsResourceRef
 objectClass: extensibleObject
 cn: topologyplugin
 nsmerge: ADD_IF_EMPTY
 
-dn: cn=defaultplugin, cn=topologyplugin, ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=defaultplugin, cn=topologyplugin, ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 objectClass: top
 objectClass: nstopologyplugin
 objectClass: extensibleObject
@@ -204,7 +204,7 @@
 nsClassname: com.netscape.management.client.topology.DefaultTopologyPlugin
 nsmerge: {nsclassname}MULTI_MERGE
 
-dn: cn=UI,ou=%as_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=UI,ou=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
 cn: UI
 objectClass: top
 objectClass: nsAdminConsoleUser


Index: 10dsdata.ldif.tmpl
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10dsdata.ldif.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 10dsdata.ldif.tmpl	20 Jun 2007 23:50:11 -0000	1.4
+++ 10dsdata.ldif.tmpl	21 Jun 2007 22:01:52 -0000	1.5
@@ -17,6 +17,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #
 # END COPYRIGHT BLOCK
+dn: o=NetscapeRoot
+changetype: modify
+add: aci
+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=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
 objectClass: nsApplication
 objectClass: groupOfUniqueNames