4:37 p.m.
admserv/newinst/src/dirserver.map.in | 1
admserv/newinst/src/register_param.map.in | 1
admserv/schema/ldif/00nsroot_backend.ldif.tmpl | 5 -
admserv/schema/ldif/01nsroot.ldif.tmpl | 26 +++----
admserv/schema/ldif/02globalpreferences.ldif.tmpl | 46 ++++++------
admserv/schema/ldif/10dsdata.ldif.tmpl | 64 +++++++++---------
admserv/schema/ldif/10rm_dsdata.ldif.tmpl | 10 +-
admserv/schema/ldif/11dstasks.ldif.tmpl | 68 +++++++++----------
admserv/schema/ldif/12dsconfig.mod.tmpl | 6 -
admserv/schema/ldif/13dsschema.mod.tmpl | 6 -
admserv/schema/ldif/16dssuffixadmin.mod.tmpl | 6 -
admserv/schema/ldif/20asdata.ldif.tmpl | 54 +++++++--------
admserv/schema/ldif/21astasks.ldif.tmpl | 78 +++++++++++-----------
admserv/schema/ldif/22ascommands.ldif.tmpl | 8 +-
admserv/schema/ldif/asmigrate.ldif.tmpl | 10 +-
15 files changed, 195 insertions(+), 194 deletions(-)
New commits:
commit d7b1055cbc70228341358272fafd7c98e8561f46
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Wed Feb 3 13:04:12 2010 -0800
560827 - Admin Server templates: DistinguishName validation fails
https://bugzilla.redhat.com/show_bug.cgi?id=560827
Description:
admserv/newinst/src/dirserver.map.in
/register_param.map.in
--- added escapedrootdn key, which is an escaped rootdn compliant
with RFC4514
admserv/schema/ldif/*.tmpl
--- removed unescaped '"' from dn strings, which violates RFC4514.
escaped special characters ('=' and ',') which used to be a
value surrounded in the double quotes '"'.
removed spaces around ','
diff --git a/admserv/newinst/src/dirserver.map.in b/admserv/newinst/src/dirserver.map.in
index 5aa4f01..f1b2c6f 100644
--- a/admserv/newinst/src/dirserver.map.in
+++ b/admserv/newinst/src/dirserver.map.in
@@ -55,6 +55,7 @@ ds_user = SuiteSpotUserID
ds_port = ServerPort
ds_secure_port = SecureServerPort:"636"
rootdn = RootDN
+escapedrootdn = `$returnvalue = dnEscape($mapper->{rootdn});`
ds_suffix = Suffix
ds_buildnum = BuildNumber
ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
diff --git a/admserv/newinst/src/register_param.map.in
b/admserv/newinst/src/register_param.map.in
index 259065b..cd13c61 100644
--- a/admserv/newinst/src/register_param.map.in
+++ b/admserv/newinst/src/register_param.map.in
@@ -71,6 +71,7 @@ ds_user = SuiteSpotUserID
ds_port = ServerPort
ds_secure_port = SecureServerPort:"636"
rootdn = RootDN
+escapedrootdn = `$returnvalue = dnEscape($mapper->{rootdn});`
ds_suffix = Suffix
ds_buildnum = BuildNumber
ds_passwd = RootDNPwd
diff --git a/admserv/schema/ldif/00nsroot_backend.ldif.tmpl
b/admserv/schema/ldif/00nsroot_backend.ldif.tmpl
index 45bc89c..51a2e19 100644
--- a/admserv/schema/ldif/00nsroot_backend.ldif.tmpl
+++ b/admserv/schema/ldif/00nsroot_backend.ldif.tmpl
@@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
-dn: cn=NetscapeRoot, cn=ldbm database, cn=plugins, cn=config
+dn: cn=NetscapeRoot,cn=ldbm database,cn=plugins,cn=config
objectClass: top
objectClass: extensibleObject
objectClass: nsBackendInstance
@@ -27,11 +27,10 @@ nsslapd-cachesize: -1
nsslapd-cachememsize: 10485760
nsslapd-directory: NetscapeRoot
-dn: cn="o=NetscapeRoot",cn=mapping tree,cn=config
+dn: cn=o\=NetscapeRoot,cn=mapping tree,cn=config
objectClass: top
objectClass: extensibleObject
objectClass: nsMappingTree
-cn: "o=NetscapeRoot"
cn: o=NetscapeRoot
nsslapd-state: backend
nsslapd-backend: NetscapeRoot
diff --git a/admserv/schema/ldif/01nsroot.ldif.tmpl
b/admserv/schema/ldif/01nsroot.ldif.tmpl
index e0aebac..b655981 100644
--- a/admserv/schema/ldif/01nsroot.ldif.tmpl
+++ b/admserv/schema/ldif/01nsroot.ldif.tmpl
@@ -21,36 +21,36 @@ dn: o=NetscapeRoot
objectClass: top
objectClass: organization
o: NetscapeRoot
-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="*")(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";)
-dn: ou=TopologyManagement, o=NetscapeRoot
+dn: ou=TopologyManagement,o=NetscapeRoot
objectClass: top
objectClass: organizationalunit
ou: TopologyManagement
description: Branch for Configuration Administration users and groups
aci: (targetattr!="userPassword")(version 3.0; acl "Enable anonymous
access"; allow (read, search, compare)userdn="ldap:///anyone";)
-dn: ou=Groups, ou=TopologyManagement, o=NetscapeRoot
+dn: ou=Groups,ou=TopologyManagement,o=NetscapeRoot
objectClass: top
objectClass: organizationalunit
ou: Groups
description: Standard Branch for group entries
-dn: ou=Administrators, ou=TopologyManagement, o=NetscapeRoot
+dn: ou=Administrators,ou=TopologyManagement,o=NetscapeRoot
objectClass: top
objectClass: organizationalunit
ou: Administrators
description: Standard branch for Configuration Administrator (uid) entries
-dn: cn=Configuration Administrators, ou=Groups, ou=TopologyManagement, o=NetscapeRoot
+dn: cn=Configuration Administrators,ou=Groups,ou=TopologyManagement,o=NetscapeRoot
objectClass: top
objectClass: groupofuniquenames
cn: Configuration Administrators
-uniqueMember: uid=%as_uid%,ou=Administrators, ou=TopologyManagement, o=NetscapeRoot
+uniqueMember: uid=%as_uid%,ou=Administrators,ou=TopologyManagement,o=NetscapeRoot
-dn: uid=%as_uid%, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot
+dn: uid=%as_uid%,ou=Administrators,ou=TopologyManagement,o=NetscapeRoot
objectClass: top
objectClass: person
objectClass: organizationalperson
@@ -61,7 +61,7 @@ givenName: Configuration
uid: %as_uid%
userPassword: %as_passwd%
-dn: ou=%domain%, o=NetscapeRoot
+dn: ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalUnit
objectClass: nsadmindomain
@@ -69,25 +69,25 @@ ou: %domain%
description: Standard branch for configuration information
nsAdminDomainName: %domain%
-dn: ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: ou=Global Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalunit
ou: Global Preferences
aci: (targetattr=*)(version 3.0; acl "Enable anonymous access";
allow(read,search) userdn="ldap:///anyone";)
-dn: ou=Host Preferences, ou=%domain%, o=NetscapeRoot
+dn: ou=Host Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalunit
ou: Host Preferences
-dn: ou=UserPreferences, ou=%domain%, o=NetscapeRoot
+dn: ou=UserPreferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalUnit
ou: UserPreferences
aci: (targetattr = "*")(version 3.0; acl "Allow saving of User
Preferences"; allow (add) userdn = "ldap:///all";)
-dn: ou="uid=%as_uid%, ou=Administrators, ou=TopologyManagement,
o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
+dn:
ou=uid\=%as_uid%\,ou\=Administrators\,ou\=TopologyManagement\,o\=NetscapeRoot,ou=UserPreferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalUnit
aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all)
userdnattr="creatorsname";)
-ou: uid=%as_uid%, ou=Administrators, ou=TopologyManagement, o=NetscapeRoot
+ou: uid=%as_uid%,ou=Administrators,ou=TopologyManagement,o=NetscapeRoot
diff --git a/admserv/schema/ldif/02globalpreferences.ldif.tmpl
b/admserv/schema/ldif/02globalpreferences.ldif.tmpl
index 1397afc..941906b 100644
--- a/admserv/schema/ldif/02globalpreferences.ldif.tmpl
+++ b/admserv/schema/ldif/02globalpreferences.ldif.tmpl
@@ -17,35 +17,35 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
-dn: ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: ou=Admin,ou=Global Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalUnit
objectClass: extensibleObject
ou: admin
nsmerge: ADD_IF_EMPTY
-dn: ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: ou=%console_version%,ou=Admin,ou=Global Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalunit
objectClass: extensibleObject
ou: %as_baseversion%
nsmerge: ADD_IF_EMPTY
-dn: cn=ResourceEditorExtension, ou=%console_version%, ou=Admin, ou=Global Preferences,
ou=%domain%, o=NetscapeRoot
+dn: cn=ResourceEditorExtension,ou=%console_version%,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=%console_version%, ou=Admin,
ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn:
cn=nsroledefinition,cn=ResourceEditorExtension,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleInfo@%ds_console_jar%
nsClassname: com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@%ds_console_jar%
nsClassname:
com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@%ds_console_jar%
-dn: cn=nsroledefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin,
ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn:
cn=nsroledefinition,cn=ResourceEditorExtension,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
cn: nsroledefinition
objectClass: top
objectClass: extensibleObject
@@ -57,14 +57,14 @@ nsClassname:
com.netscape.admin.dirserv.roledit.ResEditorRoleMembers@%ds_console
nsClassname:
com.netscape.admin.dirserv.roledit.ResEditorRoleAccountPage@%ds_console_jar%
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin,
ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn:
cn=cossuperdefinition,cn=ResourceEditorExtension,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.cosedit.ResEditorCosInfo@%ds_console_jar%
nsClassname: com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@%ds_console_jar%
nsClassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@%ds_console_jar%
-dn: cn=cossuperdefinition, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin,
ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn:
cn=cossuperdefinition,cn=ResourceEditorExtension,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
cn: cossuperdefinition
objectClass: top
objectClass: extensibleObject
@@ -76,14 +76,14 @@ nsClassname:
com.netscape.admin.dirserv.cosedit.ResEditorCosAttributes@%ds_conso
nsClassname: com.netscape.admin.dirserv.cosedit.ResEditorCosTemplate@%ds_console_jar%
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=UserDirectory, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=UserDirectory,ou=Global Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsDirectoryInfo
cn: UserDirectory
nsDirectoryURL: ldap://%fqdn%:%ds_port%/%ds_suffix%
nsDirectoryFailoverList:
-dn: cn=Common, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=Common,ou=Global Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsResourceRef
objectClass: nsGlobalParameters
@@ -98,7 +98,7 @@ nsmerge: {nsuseridformat}ADD_IF_EMPTY
nsmerge: {nsuserrdncomponent}ADD_IF_EMPTY
nsmerge: {nsgrouprdncomponent}ADD_IF_EMPTY
-dn: cn=Client, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=Client,ou=Admin,ou=Global Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsResourceRef
objectClass: nsAdminGlobalParameters
@@ -111,18 +111,18 @@ nsNickName: cert,cert,%brand% Certificate Server
nsmerge: {nsadminenduserhtmlindex}MULTI_MERGE
nsmerge: {nsnickname}MULTI_MERGE
-dn: cn=PublicViews, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%,
o=NetscapeRoot
+dn: cn=PublicViews,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsAdminConsoleUser
cn: PublicViews
aci: (targetattr = "*")(version 3.0; acl "Allow Authenticated Users to
Save Public Views"; allow (all) userdn = "ldap:///all";)
-dn: cn=CustomView, ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%,
o=NetscapeRoot
+dn: cn=CustomView,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsResourceRef
cn: CustomView
-dn: cn=inetorgPerson, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin,
ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=inetorgPerson,cn=ResourceEditorExtension,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
cn: inetorgPerson
objectClass: nsResourceRef
objectClass: nsAdminResourceEditorExtension
@@ -136,7 +136,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorNTUser
nsClassname: com.netscape.management.client.ug.ResEditorPosixUser
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=organizationalPerson, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin,
ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn:
cn=organizationalPerson,cn=ResourceEditorExtension,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
cn: organizationalPerson
objectClass: nsResourceRef
objectClass: nsAdminResourceEditorExtension
@@ -148,7 +148,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorAccountPage
nsClassname: com.netscape.management.client.ug.LanguagePage
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=groupofuniquenames, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin,
ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn:
cn=groupofuniquenames,cn=ResourceEditorExtension,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
cn: groupofuniquenames
objectClass: nsResourceRef
objectClass: nsAdminResourceEditorExtension
@@ -161,7 +161,7 @@ nsClassname: com.netscape.management.client.ug.ResEditorAccountPage
nsClassname: com.netscape.management.client.ug.LanguagePage
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=organizationalunit, cn=ResourceEditorExtension, ou=%console_version%, ou=Admin,
ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+dn:
cn=organizationalunit,cn=ResourceEditorExtension,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
cn: organizationalunit
objectClass: nsResourceRef
objectClass: nsAdminResourceEditorExtension
@@ -172,12 +172,12 @@ nsClassname: com.netscape.management.client.ug.OUPage
nsClassname: com.netscape.management.client.ug.LanguagePage
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=defaultObjectClassesContainer, ou=%console_version%, ou=Admin, ou=Global
Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=defaultObjectClassesContainer,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsResourceRef
cn: DefaultObjectClassesContainer
-dn: cn=user, cn=defaultObjectClassesContainer, ou=%console_version%, ou=Admin, ou=Global
Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=user,cn=defaultObjectClassesContainer,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsResourceRef
objectClass: nsdefaultObjectClasses
@@ -187,7 +187,7 @@ nsDefaultObjectClass: person
nsDefaultObjectClass: organizationalPerson
nsDefaultObjectClass: inetorgperson
-dn: cn=group, cn=defaultObjectClassesContainer, ou=%console_version%, ou=Admin, ou=Global
Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=group,cn=defaultObjectClassesContainer,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsResourceRef
objectClass: nsdefaultObjectClasses
@@ -195,7 +195,7 @@ cn: group
nsDefaultObjectClass: top
nsDefaultObjectClass: groupofuniquenames
-dn: cn=ou, cn=defaultObjectClassesContainer, ou=%console_version%, ou=Admin, ou=Global
Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=ou,cn=defaultObjectClassesContainer,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsResourceRef
objectClass: nsdefaultObjectClasses
@@ -203,14 +203,14 @@ cn: ou
nsDefaultObjectClass: top
nsDefaultObjectClass: organizationalunit
-dn: cn=topologyplugin, ou=%console_version%, ou=Admin, ou=Global Preferences,
ou=%domain%, o=NetscapeRoot
+dn: cn=topologyplugin,ou=%console_version%,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=%console_version%, ou=Admin, ou=Global
Preferences, ou=%domain%, o=NetscapeRoot
+dn: cn=defaultplugin,cn=topologyplugin,ou=%console_version%,ou=Admin,ou=Global
Preferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nstopologyplugin
objectClass: extensibleObject
@@ -219,7 +219,7 @@ cn: defaultplugin
nsClassname: com.netscape.management.client.topology.DefaultTopologyPlugin
nsmerge: {nsclassname}MULTI_MERGE
-dn: cn=UI,ou=%console_version%, ou=Admin, ou=Global Preferences, ou=%domain%,
o=NetscapeRoot
+dn: cn=UI,ou=%console_version%,ou=Admin,ou=Global Preferences,ou=%domain%,o=NetscapeRoot
cn: UI
objectClass: top
objectClass: nsAdminConsoleUser
diff --git a/admserv/schema/ldif/10dsdata.ldif.tmpl
b/admserv/schema/ldif/10dsdata.ldif.tmpl
index 3a03c0b..23a891b 100644
--- a/admserv/schema/ldif/10dsdata.ldif.tmpl
+++ b/admserv/schema/ldif/10dsdata.ldif.tmpl
@@ -20,16 +20,16 @@
dn: o=NetscapeRoot
changetype: modify
add: aci
-aci: (targetattr = "*")(version 3.0; acl "SIE Group (%dsid%)"; allow
(all) groupdn = "ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server
Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+aci: (targetattr = "*")(version 3.0; acl "SIE Group (%dsid%)"; allow
(all) groupdn = "ldap:///cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
-dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsOsVersion
replace: nsHardwarePlatform
nsOsVersion: %uname_a%
nsHardwarePlatform: %uname_m%
-dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsHost
objectClass: groupOfUniqueNames
@@ -37,25 +37,25 @@ cn: %fqdn%
serverHostName: %fqdn%
nsOsVersion: %uname_a%
nsHardwarePlatform: %uname_m%
-uniqueMember: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+uniqueMember: cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
add: uniqueMember
-uniqueMember: cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot
+uniqueMember: cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: nsAdminGroup
objectClass: groupOfUniqueNames
objectClass: nsDirectoryInfo
objectClass: top
nsAdminGroupName: Server Group
-nsAdminSIEDN: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-nsDirectoryInfoRef: cn=UserDirectory, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
+nsAdminSIEDN: cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+nsDirectoryInfoRef: cn=UserDirectory,ou=Global Preferences,ou=%domain%,o=NetscapeRoot
cn: Server Group
-uniqueMember: cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot
+uniqueMember: 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
+dn: cn=%brand% Directory Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsProductVersion
replace: nsBuildNumber
@@ -63,10 +63,10 @@ replace: nsServerMigrationClassname
replace: nsServerCreationClassname
nsProductVersion: %ds_version%
nsBuildNumber: %ds_buildnum%
-nsServerMigrationClassname:
com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-nsServerCreationClassname:
com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsServerMigrationClassname:
com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+nsServerCreationClassname:
com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: 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
objectClass: top
@@ -79,11 +79,11 @@ nsVendor: %vendor%
installationTimeStamp: %timestamp%
nsExpirationDate: 0
nsBuildSecurity: domestic
-uniqueMember: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
-nsServerMigrationClassname:
com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-nsServerCreationClassname:
com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+uniqueMember: cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+nsServerMigrationClassname:
com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+nsServerCreationClassname:
com.netscape.admin.dirserv.task.MigrateCreate@%ds_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
+dn: cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: netscapeServer
objectClass: nsDirectoryServer
objectClass: nsResourceRef
@@ -102,41 +102,41 @@ installationTimeStamp: %timestamp%
nsSuiteSpotUser: %ds_user%
serverHostName: %fqdn%
cn: slapd-%dsid%
-uniqueMember: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
-uniqueMember: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read,
search, compare) groupdn="ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server,
cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
-aci: (targetattr="uniquemember || serverProductName || userpassword ||
description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl
"Enable access delegation"; allow (write) groupdn="ldap:///cn=slapd-%dsid%,
cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot";)
+uniqueMember: cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+uniqueMember: cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read,
search, compare) groupdn="ldap:///cn=slapd-%dsid%,cn=%brand% Directory
Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
+aci: (targetattr="uniquemember || serverProductName || userpassword ||
description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl
"Enable access delegation"; allow (write)
groupdn="ldap:///cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
-dn: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
+dn: cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: serverVersionNumber
serverVersionNumber: %ds_version%
-dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=configuration,cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsClassname
replace: nsJarfilename
-nsClassname: com.netscape.admin.dirserv.DSAdmin@%ds_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsClassname:
com.netscape.admin.dirserv.DSAdmin@%ds_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
nsJarfilename: %ds_console_jar%
-dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=configuration,cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: nsResourceRef
objectClass: nsAdminObject
objectClass: nsDirectoryInfo
objectClass: top
cn: configuration
-nsClassname: com.netscape.admin.dirserv.DSAdmin@%ds_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsClassname:
com.netscape.admin.dirserv.DSAdmin@%ds_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
nsJarfilename: %ds_console_jar%
-nsDirectoryInfoRef: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-aci: (targetattr=*)(version 3.0; acl "Enable Server configuration"; allow (all)
groupdn="ldap:///cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+nsDirectoryInfoRef: cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+aci: (targetattr=*)(version 3.0; acl "Enable Server configuration"; allow (all)
groupdn="ldap:///cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
-dn: ou="cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
+dn: ou=cn\=slapd-%dsid%\,cn\=%brand% Directory Server\,cn\=Server
Group\,cn\=%fqdn%\,ou\=%domain%\,o\=NetscapeRoot,ou=UserPreferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalUnit
aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all)
userdnattr="creatorsname";)
-ou: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
+ou: cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: ou="%rootdn%",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
+dn: ou=%escapedrootdn%,ou=UserPreferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalUnit
aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all)
userdnattr="creatorsname";)
diff --git a/admserv/schema/ldif/10rm_dsdata.ldif.tmpl
b/admserv/schema/ldif/10rm_dsdata.ldif.tmpl
index d0ed815..832edc8 100644
--- a/admserv/schema/ldif/10rm_dsdata.ldif.tmpl
+++ b/admserv/schema/ldif/10rm_dsdata.ldif.tmpl
@@ -20,15 +20,15 @@
dn: o=NetscapeRoot
changetype: modify
delete: 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";)
+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
+dn: cn=%brand% Directory Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
delete: uniqueMember
-uniqueMember: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
+uniqueMember: cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
+dn: cn=slapd-%dsid%,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: delete
-dn: ou="cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot",ou=UserPreferences, ou=%domain%, o=NetscapeRoot
+dn: ou=cn\=slapd-%dsid%\,cn\=%brand% Directory Server\,cn\=Server
Group\,cn\=%fqdn%\,ou\=%domain%\,o\=NetscapeRoot,ou=UserPreferences,ou=%domain%,o=NetscapeRoot
changetype: delete
diff --git a/admserv/schema/ldif/11dstasks.ldif.tmpl
b/admserv/schema/ldif/11dstasks.ldif.tmpl
index d473ab9..bdabefe 100644
--- a/admserv/schema/ldif/11dstasks.ldif.tmpl
+++ b/admserv/schema/ldif/11dstasks.ldif.tmpl
@@ -17,35 +17,35 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
-dn: cn=Tasks, %ds_sie%
+dn: cn=Tasks,%ds_sie%
objectClass: top
objectClass: nsResourceRef
cn: Tasks
-dn: cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=Operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstaskgroup
nsTaskLabel: Operation Tasks Group
cn: Operation
# change description so that it always lists the correct tasks
-dn: cn=task summary, cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=task summary,cn=Operation,cn=Tasks,%ds_sie%
changetype: modify
replace: description
description: start stop restart Backup Restore KeyCert Authenticate CompleteImport
CompleteExport
-dn: cn=task summary, cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=task summary,cn=Operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nsConfig
description: start stop restart Backup Restore KeyCert Authenticate CompleteImport
CompleteExport
cn: task summary
-dn: cn=start, cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=start,cn=Operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.Start@%ds_console_jar%@%as_sie%
-dn: cn=start, cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=start,cn=Operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -53,12 +53,12 @@ nsClassname:
com.netscape.admin.dirserv.task.Start@%ds_console_jar%@%as_sie%
nsExecRef: ds_start
cn: start
-dn: cn=stop, cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=stop,cn=Operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.Stop@%ds_console_jar%@%as_sie%
-dn: cn=stop, cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=stop,cn=Operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -66,12 +66,12 @@ nsClassname:
com.netscape.admin.dirserv.task.Stop@%ds_console_jar%@%as_sie%
nsExecRef: ds_shutdown
cn: stop
-dn: cn=restart, cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=restart,cn=Operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.Restart@%ds_console_jar%@%as_sie%
-dn: cn=restart, cn=Operation, cn=Tasks, %ds_sie%
+dn: cn=restart,cn=Operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -79,151 +79,151 @@ nsClassname:
com.netscape.admin.dirserv.task.Restart@%ds_console_jar%@%as_sie%
nsExecRef: ds_restart
cn: restart
-dn: cn=Backup, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=Backup,cn=operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.Backup@%ds_console_jar%@%as_sie%
-dn: cn=Backup, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=Backup,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsClassname: com.netscape.admin.dirserv.task.Backup@%ds_console_jar%@%as_sie%
cn: Backup
-dn: cn=Restore, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=Restore,cn=operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.Restore@%ds_console_jar%@%as_sie%
-dn: cn=Restore, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=Restore,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsClassname: com.netscape.admin.dirserv.task.Restore@%ds_console_jar%@%as_sie%
cn: Restore
-dn: cn=KeyCert, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=KeyCert,cn=operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.KeyCert@%ds_console_jar%@%as_sie%
-dn: cn=KeyCert, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=KeyCert,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsClassname: com.netscape.admin.dirserv.task.KeyCert@%ds_console_jar%@%as_sie%
cn: KeyCert
-dn: cn=Authenticate, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=Authenticate,cn=operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.Authenticate@%ds_console_jar%@%as_sie%
-dn: cn=Authenticate, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=Authenticate,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsClassname: com.netscape.admin.dirserv.task.Authenticate@%ds_console_jar%@%as_sie%
cn: Authenticate
-dn: cn=CompleteImport, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=CompleteImport,cn=operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.CompleteImport@%ds_console_jar%@%as_sie%
-dn: cn=CompleteImport, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=CompleteImport,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsClassname: com.netscape.admin.dirserv.task.CompleteImport@%ds_console_jar%@%as_sie%
cn: CompleteImport
-dn: cn=CompleteExport, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=CompleteExport,cn=operation,cn=Tasks,%ds_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.admin.dirserv.task.CompleteExport@%ds_console_jar%@%as_sie%
-dn: cn=CompleteExport, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=CompleteExport,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsClassname: com.netscape.admin.dirserv.task.CompleteExport@%ds_console_jar%@%as_sie%
cn: CompleteExport
-dn: cn=ViewLog, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=ViewLog,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: viewlog
cn: ViewLog
-dn: cn=ListBackups, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=ListBackups,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: ds_listdb
cn: ListBackups
-dn: cn=Remove, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=Remove,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: ds_remove
cn: Remove
-dn: cn=CreateVLVIndex, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=CreateVLVIndex,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
cn: CreateVLVIndex
-dn: cn=AddIndex, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=AddIndex,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
cn: AddIndex
-dn: cn=SNMPCtrl, cn=operation, cn=Tasks, %ds_sie%
+dn: cn=SNMPCtrl,cn=operation,cn=Tasks,%ds_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: ds_snmpctrl
cn: SNMPCtrl
-dn: cn=Tasks, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot
+dn: cn=Tasks,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsResourceRef
cn: Tasks
-dn: cn=Operation, cn=Tasks, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
+dn: cn=Operation,cn=Tasks,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nstaskgroup
nsTaskLabel: Operation Tasks Group
cn: Operation
-dn: cn=Migrate, cn=Operation, cn=Tasks, cn=%brand% Directory Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=Migrate,cn=Operation,cn=Tasks,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: perl?migrateInstance
cn: Migrate
-dn: cn=Create, cn=Operation, cn=Tasks, cn=%brand% Directory Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=Create,cn=Operation,cn=Tasks,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: ds_create
cn: Create
-dn: cn=GetConfigInfo, cn=Operation, cn=Tasks, cn=%brand% Directory Server, cn=Server
Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=GetConfigInfo,cn=Operation,cn=Tasks,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: perl?getConfigInfo
cn: GetConfigInfo
-dn: cn=MigrateLocalDB, cn=Operation, cn=Tasks, cn=%brand% Directory Server, cn=Server
Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=MigrateLocalDB,cn=Operation,cn=Tasks,cn=%brand% Directory Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
diff --git a/admserv/schema/ldif/12dsconfig.mod.tmpl
b/admserv/schema/ldif/12dsconfig.mod.tmpl
index 50f3456..14f482a 100644
--- a/admserv/schema/ldif/12dsconfig.mod.tmpl
+++ b/admserv/schema/ldif/12dsconfig.mod.tmpl
@@ -20,9 +20,9 @@
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=%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";)
+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=%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
diff --git a/admserv/schema/ldif/13dsschema.mod.tmpl
b/admserv/schema/ldif/13dsschema.mod.tmpl
index 3c176ae..2454d5e 100644
--- a/admserv/schema/ldif/13dsschema.mod.tmpl
+++ b/admserv/schema/ldif/13dsschema.mod.tmpl
@@ -21,6 +21,6 @@ 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=%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";)
+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=%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";)
diff --git a/admserv/schema/ldif/16dssuffixadmin.mod.tmpl
b/admserv/schema/ldif/16dssuffixadmin.mod.tmpl
index eb14e8b..a3cb7f8 100644
--- a/admserv/schema/ldif/16dssuffixadmin.mod.tmpl
+++ b/admserv/schema/ldif/16dssuffixadmin.mod.tmpl
@@ -20,6 +20,6 @@
dn: %ds_suffix%
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=%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";)
+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=%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";)
diff --git a/admserv/schema/ldif/20asdata.ldif.tmpl
b/admserv/schema/ldif/20asdata.ldif.tmpl
index 8129f7f..5a462b9 100644
--- a/admserv/schema/ldif/20asdata.ldif.tmpl
+++ b/admserv/schema/ldif/20asdata.ldif.tmpl
@@ -17,14 +17,14 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
-dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsOsVersion
replace: nsHardwarePlatform
nsOsVersion: %uname_a%
nsHardwarePlatform: %uname_m%
-dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsHost
objectClass: groupOfUniqueNames
@@ -32,27 +32,27 @@ cn: %fqdn%
serverHostName: %fqdn%
nsOsVersion: %uname_a%
nsHardwarePlatform: %uname_m%
-uniqueMember: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+uniqueMember: cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
add: aci
add: uniqueMember
-aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read,
search, compare) userdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration
Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
-uniqueMember: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot
+aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read,
search, compare) userdn="ldap:///cn=admin-serv-%asid%,cn=%brand% Administration
Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
+uniqueMember: cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: nsAdminGroup
objectClass: groupOfUniqueNames
objectClass: nsDirectoryInfo
objectClass: top
nsAdminGroupName: Server Group
-nsDirectoryInfoRef: cn=UserDirectory, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
-nsAdminSIEDN: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsDirectoryInfoRef: cn=UserDirectory,ou=Global Preferences,ou=%domain%,o=NetscapeRoot
+nsAdminSIEDN: cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
cn: Server Group
-uniqueMember: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot
+uniqueMember: cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot
+dn: cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsProductVersion
replace: nsBuildNumber
@@ -61,7 +61,7 @@ nsProductVersion: %as_version%
nsBuildNumber: %as_buildnum%
nsServerMigrationClassname:
com.netscape.management.admserv.AdminServerProduct@%as_console_jar%
-dn: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot
+dn: cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: nsApplication
objectClass: groupOfUniqueNames
@@ -74,10 +74,10 @@ nsBuildNumber: %as_buildnum%
installationTimeStamp: %timestamp%
nsBuildSecurity: domestic
nsServerMigrationClassname:
com.netscape.management.admserv.AdminServerProduct@%as_console_jar%
-uniqueMember: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-aci: (targetattr=*)(targetfilter=(nsNickName=*))(version 3.0; acl "Enable delegated
access"; allow (read, search, compare) groupdn="ldap:///cn=%brand%
Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+uniqueMember: cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+aci: (targetattr=*)(targetfilter=(nsNickName=*))(version 3.0; acl "Enable delegated
access"; allow (read, search, compare) groupdn="ldap:///cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
-dn: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
+dn: cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: netscapeServer
objectClass: nsAdminServer
@@ -88,16 +88,16 @@ nsServerID: admin-serv
serverProductName: Administration Server
serverHostName: %fqdn%
installationTimeStamp: %timestamp%
-uniqueMember: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read,
search, compare) groupdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration
Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
-aci: (targetattr="uniquemember || serverProductName || userpassword ||
description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl
"Enable access delegation"; allow (write)
groupdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server
Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+uniqueMember: cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+aci: (targetattr=*)(version 3.0; acl "Enable delegated access"; allow (read,
search, compare) groupdn="ldap:///cn=admin-serv-%asid%,cn=%brand% Administration
Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
+aci: (targetattr="uniquemember || serverProductName || userpassword ||
description")(targetfilter=(objectclass=netscapeServer))(version 3.0; acl
"Enable access delegation"; allow (write)
groupdn="ldap:///cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
-dn: cn=configuration, cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server
Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=configuration,cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsClassname
-nsClassname:
com.netscape.management.admserv.AdminServer@%as_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsClassname:
com.netscape.management.admserv.AdminServer@%as_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=configuration, cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server
Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=configuration,cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
objectClass: nsConfig
objectClass: nsAdminConfig
objectClass: nsAdminObject
@@ -109,7 +109,7 @@ nsSuiteSpotUser: %as_user%
nsServerAddress: %as_addr%
nsAdminEnableEnduser: on
nsAdminEnableDSGW: on
-nsDirectoryInfoRef: cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsDirectoryInfoRef: cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
nsAdminUsers: %admpw%
nsErrorLog: %as_error%
nsPidLog: %as_pid%
@@ -119,12 +119,12 @@ nsAdminAccessHosts: *.%domain%
nsAdminAccessAddresses: *
nsAdminOneACLDir: adminacl
nsDefaultAcceptLanguage: en
-nsClassname:
com.netscape.management.admserv.AdminServer@%as_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
-aci: (targetattr=*)(version 3.0; acl "Enable delegated admin to access
configuration"; allow (read, search) groupdn="ldap:///cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
-aci: (targetattr=*)(version 3.0; acl "Enable Server configuration"; allow (all)
groupdn="ldap:///cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server
Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
+nsClassname:
com.netscape.management.admserv.AdminServer@%as_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
+aci: (targetattr=*)(version 3.0; acl "Enable delegated admin to access
configuration"; allow (read, search) groupdn="ldap:///cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
+aci: (targetattr=*)(version 3.0; acl "Enable Server configuration"; allow (all)
groupdn="ldap:///cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot";)
-dn: ou="cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group,
cn=%fqdn%, ou=%domain%, o=NetscapeRoot",ou=UserPreferences, ou=%domain%,
o=NetscapeRoot
+dn: ou=cn\=admin-serv-%asid%\,cn\=%brand% Administration Server\,cn\=Server
Group\,cn\=%fqdn%\,ou\=%domain%\,o\=NetscapeRoot,ou=UserPreferences,ou=%domain%,o=NetscapeRoot
objectClass: top
objectClass: organizationalUnit
aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all)
userdnattr="creatorsname";)
-ou: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=netscaperoot
+ou: cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=netscaperoot
diff --git a/admserv/schema/ldif/21astasks.ldif.tmpl
b/admserv/schema/ldif/21astasks.ldif.tmpl
index d0e3857..ea45a1e 100644
--- a/admserv/schema/ldif/21astasks.ldif.tmpl
+++ b/admserv/schema/ldif/21astasks.ldif.tmpl
@@ -17,25 +17,25 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
-dn: cn=Tasks, %as_sie%
+dn: cn=Tasks,%as_sie%
objectClass: top
objectClass: nsResourceRef
cn: Tasks
-dn: cn=Operation, cn=Tasks, %as_sie%
+dn: cn=Operation,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstaskgroup
nsTaskLabel: Operation Tasks Group
cn: Operation
-dn: cn=Stop, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=Stop,cn=Operation,cn=Tasks,%as_sie%
changetype: modify
replace: nsClassname
replace: nsHelpRef
nsClassname: com.netscape.management.admserv.task.Stop@%as_console_jar%@%as_sie%
nsHelpRef: %as_help_path%/stopadm.html
-dn: cn=Stop, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=Stop,cn=Operation,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -44,14 +44,14 @@ nsExecRef: stopsrv
nsClassname: com.netscape.management.admserv.task.Stop@%as_console_jar%@%as_sie%
cn: Stop
-dn: cn=Restart, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=Restart,cn=Operation,cn=Tasks,%as_sie%
changetype: modify
replace: nsClassname
replace: nsHelpRef
nsClassname: com.netscape.management.admserv.task.Restart@%as_console_jar%@%as_sie%
nsHelpRef: %as_help_path%/restartadm.html
-dn: cn=Restart, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=Restart,cn=Operation,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -60,39 +60,39 @@ nsExecRef: restartsrv
nsClassname: com.netscape.management.admserv.task.Restart@%as_console_jar%@%as_sie%
cn: Restart
-dn: cn=Authenticate, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=Authenticate,cn=Operation,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/userauth.html
-dn: cn=Authenticate, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=Authenticate,cn=Operation,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
nsHelpRef: %as_help_path%/userauth.html
nsExecRef: userauth
cn: Authenticate
-dn: cn=ListOldServers, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=ListOldServers,cn=Operation,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: listOldSrvs
cn: ListOldServers
-dn: cn=StartConfigDS, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=StartConfigDS,cn=Operation,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
nsExecRef: start_config_ds
cn: StartConfigDS
-dn: cn=MigrateConfig, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=MigrateConfig,cn=Operation,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: migrateConfig
cn: MigrateConfig
-dn: cn=StatusPing, cn=Operation, cn=Tasks, %as_sie%
+dn: cn=StatusPing,cn=Operation,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -100,18 +100,18 @@ nsExecRef: statusping
nsLogSuppress: true
cn: StatusPing
-dn: cn=Configuration, cn=Tasks, %as_sie%
+dn: cn=Configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstaskgroup
nsTaskLabel: Configuration Tasks Group
cn: Configuration
-dn: cn=ServerSetup, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=ServerSetup,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsClassname
nsClassname: com.netscape.management.admserv.task.ServerSetup@%as_console_jar%@%as_sie%
-dn: cn=ServerSetup, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=ServerSetup,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -119,35 +119,35 @@ nsExecRef: config
nsClassname: com.netscape.management.admserv.task.ServerSetup@%as_console_jar%@%as_sie%
cn: ServerSetup
-dn: cn=DirectorySetup, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=DirectorySetup,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: dsconfig
cn: DirectorySetup
-dn: cn=UGDirectorySetup, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=UGDirectorySetup,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: ugdsconfig
cn: UGDirectorySetup
-dn: cn=AccessSetup, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=AccessSetup,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: admpw
cn: AccessSetup
-dn: cn=Logging, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=Logging,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsClassname
replace: nsHelpRef
nsClassname: com.netscape.management.admserv.task.Logging@%as_console_jar%@%as_sie%
nsHelpRef: %as_help_path%/logging.html
-dn: cn=Logging, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=Logging,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -156,21 +156,21 @@ nsExecRef: config
nsClassname: com.netscape.management.admserv.task.Logging@%as_console_jar%@%as_sie%
cn: Logging
-dn: cn=SecurityOp, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=SecurityOp,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
nsExecRef: security
cn: SecurityOp
-dn: cn=CertSetup, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=CertSetup,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsClassname
replace: nsHelpRef
nsClassname: com.netscape.management.admserv.task.CertSetup@%as_console_jar%@%as_sie%
nsHelpRef: %as_help_path%/certrequest.html
-dn: cn=CertSetup, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=CertSetup,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -178,12 +178,12 @@ nsHelpRef: %as_help_path%/certrequest.html
nsClassname: com.netscape.management.admserv.task.CertSetup@%as_console_jar%@%as_sie%
cn: CertSetup
-dn: cn=SSLActivate, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=SSLActivate,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/ssl_activate.html
-dn: cn=SSLActivate, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=SSLActivate,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -191,12 +191,12 @@ nsHelpRef: %as_help_path%/ssl_activate.html
nsExecRef: sec-activate
cn: SSLActivate
-dn: cn=ReadLog, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=ReadLog,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/logging.html
-dn: cn=ReadLog, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=ReadLog,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -204,12 +204,12 @@ nsHelpRef: %as_help_path%/logging.html
nsExecRef: ReadLog
cn: ReadLog
-dn: cn=HTMLAdmin, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=HTMLAdmin,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/htmladmin.html
-dn: cn=HTMLAdmin, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=HTMLAdmin,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -217,12 +217,12 @@ nsHelpRef: %as_help_path%/htmladmin.html
nsExecRef: htmladmin
cn: HTMLAdmin
-dn: cn=StatPingServ, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=StatPingServ,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/statpingserv.html
-dn: cn=StatPingServ, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=StatPingServ,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -230,12 +230,12 @@ nsHelpRef: %as_help_path%/statpingserv.html
nsExecRef: statpingserv
cn: StatPingServ
-dn: cn=ViewData, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=ViewData,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/viewdata.html
-dn: cn=ViewData, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=ViewData,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -243,12 +243,12 @@ nsHelpRef: %as_help_path%/viewdata.html
nsExecRef: viewdata
cn: ViewData
-dn: cn=ViewLog, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=ViewLog,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/viewlog.html
-dn: cn=ViewLog, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=ViewLog,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -256,12 +256,12 @@ nsHelpRef: %as_help_path%/viewlog.html
nsExecRef: viewlog
cn: ViewLog
-dn: cn=MonReplication, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=MonReplication,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/monreplication.html
-dn: cn=MonReplication, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=MonReplication,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
@@ -269,12 +269,12 @@ nsHelpRef: %as_help_path%/monreplication.html
nsExecRef: monreplication
cn: MonReplication
-dn: cn=repl-monitor-cgi.pl, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=repl-monitor-cgi.pl,cn=configuration,cn=Tasks,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/monreplication.html
-dn: cn=repl-monitor-cgi.pl, cn=configuration, cn=Tasks, %as_sie%
+dn: cn=repl-monitor-cgi.pl,cn=configuration,cn=Tasks,%as_sie%
objectClass: top
objectClass: nstask
objectClass: nsAdminObject
diff --git a/admserv/schema/ldif/22ascommands.ldif.tmpl
b/admserv/schema/ldif/22ascommands.ldif.tmpl
index 930b334..fcfde8b 100644
--- a/admserv/schema/ldif/22ascommands.ldif.tmpl
+++ b/admserv/schema/ldif/22ascommands.ldif.tmpl
@@ -17,24 +17,24 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# END COPYRIGHT BLOCK
-dn: cn=Commands, %as_sie%
+dn: cn=Commands,%as_sie%
objectClass: top
objectClass: nsResourceRef
cn: Commands
-dn: cn=sync-task-sie-data, cn=Commands, %as_sie%
+dn: cn=sync-task-sie-data,cn=Commands,%as_sie%
changetype: modify
replace: nsHelpRef
nsHelpRef: %as_help_path%/sync-task-sie-data.html
-dn: cn=sync-task-sie-data, cn=Commands, %as_sie%
+dn: cn=sync-task-sie-data,cn=Commands,%as_sie%
objectClass: top
objectClass: nstask
nsHelpRef: %as_help_path%/sync-task-sie-data.html
nsExecRef: runtime
cn: sync-task-sie-data
-dn: cn=change-sie-password, cn=Commands, %as_sie%
+dn: cn=change-sie-password,cn=Commands,%as_sie%
objectClass: top
objectClass: nstask
nsExecRef: runtime
diff --git a/admserv/schema/ldif/asmigrate.ldif.tmpl
b/admserv/schema/ldif/asmigrate.ldif.tmpl
index dbe4e4c..35c4294 100644
--- a/admserv/schema/ldif/asmigrate.ldif.tmpl
+++ b/admserv/schema/ldif/asmigrate.ldif.tmpl
@@ -24,7 +24,7 @@
# away values that are not adjacent - so you must have all of the replace:
# lines next to each other, all of the add: lines, delete: lines, etc.
-dn: cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%,
o=NetscapeRoot
+dn: cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsVendor
replace: nsProductVersion
@@ -38,14 +38,14 @@ installationTimeStamp: %timestamp%
nsServerMigrationClassname:
com.netscape.management.admserv.AdminServerProduct@%as_console_jar%
delete: nsInstalledLocation
-dn: cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%,
ou=%domain%, o=NetscapeRoot
+dn: cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: installationTimeStamp
installationTimeStamp: %timestamp%
delete: userPassword
delete: serverRoot
-dn: cn=configuration, cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server
Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=configuration,cn=admin-serv-%asid%,cn=%brand% Administration Server,cn=Server
Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
replace: nsSuiteSpotUser
replace: nsAdminUsers
@@ -58,9 +58,9 @@ nsAdminUsers: %admpw%
nsErrorLog: %as_error%
nsPidLog: %as_pid%
nsAccessLog: %as_access%
-nsClassname:
com.netscape.management.admserv.AdminServer@%as_console_jar%@cn=admin-serv-%asid%,
cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+nsClassname:
com.netscape.management.admserv.AdminServer@%as_console_jar%@cn=admin-serv-%asid%,cn=%brand%
Administration Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
-dn: cn=encryption, cn=configuration, cn=admin-serv-%asid%, cn=%brand% Administration
Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
+dn: cn=encryption,cn=configuration,cn=admin-serv-%asid%,cn=%brand% Administration
Server,cn=Server Group,cn=%fqdn%,ou=%domain%,o=NetscapeRoot
changetype: modify
delete: nsCertFile
delete: nsKeyFile