Attachment 157662 Details for Bug 244749 – cvs diffs (adminserver)

[patch] cvs diffs (adminserver)

as.diffs (text/plain), 11.59 KB, created by Noriko Hosoi on 2007-06-22 22:01:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-22 22:01:44 UTC

Size: 11.59 KB

patch

obsolete

>Index: admserv/newinst/src/adminserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
>retrieving revision 1.2
>diff -t -w -U4 -r1.2 adminserver.map.in
>--- admserv/newinst/src/adminserver.map.in	21 Jun 2007 22:01:51 -0000	1.2
>+++ admserv/newinst/src/adminserver.map.in	22 Jun 2007 21:58:27 -0000
>@@ -58,8 +58,9 @@
> brand =                 Brand
> normbrand =                     NormBrand
> hostname =              `use Net::Domain qw(hostname); $returnvalue = hostname();`
> vendor =                Vendor
>+timestamp =     `use Time::gmtime; my $gm = gmtime; $returnvalue = sprintf ("%04d%02d%02d%02d%02d%02dZ", 1900+$gm->year, 1+$gm->mon, $gm->mday, $gm->hour, $gm->min, $gm->sec);`
> 
> asid =          `use Net::Domain qw(hostname); $returnvalue = hostname();`
> as_port =               Port
> admpw =                 "@configdir@/admpw"
>Index: admserv/newinst/src/dirserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
>retrieving revision 1.2
>diff -t -w -U4 -r1.2 dirserver.map.in
>--- admserv/newinst/src/dirserver.map.in	21 Jun 2007 22:01:51 -0000	1.2
>+++ admserv/newinst/src/dirserver.map.in	22 Jun 2007 21:58:27 -0000
>@@ -57,8 +57,9 @@
> domain =                AdminDomain
> brand =                 Brand
> normbrand =                     NormBrand
> vendor =                Vendor
>+timestamp =     `use Time::gmtime; my $gm = gmtime; $returnvalue = sprintf ("%04d%02d%02d%02d%02d%02dZ", 1900+$gm->year, 1+$gm->mon, $gm->mday, $gm->hour, $gm->min, $gm->sec);`
> configroot =    "CONFIG ROOT -- replace me"
> 
> asid =          `use Net::Domain qw(hostname); $returnvalue = hostname();`
> as_sie =                "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>Index: admserv/newinst/src/register_param.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
>retrieving revision 1.2
>diff -t -w -U4 -r1.2 register_param.map.in
>--- admserv/newinst/src/register_param.map.in	21 Jun 2007 22:01:51 -0000	1.2
>+++ admserv/newinst/src/register_param.map.in	22 Jun 2007 21:58:27 -0000
>@@ -61,8 +61,9 @@
> vendor =                Vendor
> uname_a =               `open(UNAMEA, "uname -a |"); $returnvalue = <UNAMEA>; chomp $returnvalue; close(UNAMEA);`
> uname_m =               `open(UNAMEM, "uname -m |"); $returnvalue = <UNAMEM>; chomp $returnvalue; close(UNAMEM);`
> configroot =    "CONFIG ROOT -- replace me"
>+timestamp =     `use Time::gmtime; my $gm = gmtime; $returnvalue = sprintf ("%04d%02d%02d%02d%02d%02dZ", 1900+$gm->year, 1+$gm->mon, $gm->mday, $gm->hour, $gm->min, $gm->sec);`
> 
> as_uid =                ServerAdminID
> as_passwd =             ServerAdminPwd
> asid =          `use Net::Domain qw(hostname); $returnvalue = hostname();`
>Index: admserv/schema/ldif/01nsroot.ldif.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/01nsroot.ldif.tmpl,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 01nsroot.ldif.tmpl
>--- admserv/schema/ldif/01nsroot.ldif.tmpl	21 Jun 2007 22:01:52 -0000	1.4
>+++ admserv/schema/ldif/01nsroot.ldif.tmpl	22 Jun 2007 21:58:27 -0000
>@@ -83,8 +83,21 @@
> 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
>+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
>+
>+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
> 
> dn: cn=%fqdn%, ou=%domain%, o=NetscapeRoot
> objectClass: top
> objectClass: nsHost
>Index: admserv/schema/ldif/02globalpreferences.ldif.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/02globalpreferences.ldif.tmpl,v
>retrieving revision 1.3
>diff -t -w -U4 -r1.3 02globalpreferences.ldif.tmpl
>--- admserv/schema/ldif/02globalpreferences.ldif.tmpl	21 Jun 2007 22:01:52 -0000	1.3
>+++ admserv/schema/ldif/02globalpreferences.ldif.tmpl	22 Jun 2007 21:58:27 -0000
>@@ -100,8 +100,9 @@
> dn: cn=PublicViews, ou=%as_baseversion%, 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=%as_baseversion%, ou=Admin, ou=Global Preferences, ou=%domain%, o=NetscapeRoot
> objectClass: top
> objectClass: nsResourceRef
>Index: admserv/schema/ldif/10dsdata.ldif.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10dsdata.ldif.tmpl,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 10dsdata.ldif.tmpl
>--- admserv/schema/ldif/10dsdata.ldif.tmpl	21 Jun 2007 22:01:52 -0000	1.5
>+++ admserv/schema/ldif/10dsdata.ldif.tmpl	22 Jun 2007 21:58:27 -0000
>@@ -32,8 +32,9 @@
> nsNickName: slapd
> nsBuildNumber: %ds_buildnum%
> nsVendor: %vendor%
> nsInstalledLocation: %ds_installedlocation%
>+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
>@@ -54,13 +55,16 @@
> nsServerPort: %ds_port%
> nsSecureServerPort: %ds_secure_port%
> serverProductName: Directory Server (%dsid%)
> serverVersionNumber: %ds_version%
>+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";)
> 
> dn: cn=configuration,cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
> objectClass: nsResourceRef
> objectClass: nsAdminObject
>@@ -69,5 +73,17 @@
> 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
> 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";)
> 
>+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
>+
>+dn: ou="%rootdn%",ou=UserPreferences, ou=sfbay.redhat.com, o=NetscapeRoot
>+objectClass: top
>+objectClass: organizationalUnit
>+aci: (targetattr=*)(version 3.0; acl "UserDNControl"; allow (all) userdnattr="creatorsname";)
>+ou: %rootdn%
>Index: admserv/schema/ldif/20asdata.ldif.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/20asdata.ldif.tmpl,v
>retrieving revision 1.3
>diff -t -w -U4 -r1.3 20asdata.ldif.tmpl
>--- admserv/schema/ldif/20asdata.ldif.tmpl	20 Jun 2007 23:50:11 -0000	1.3
>+++ admserv/schema/ldif/20asdata.ldif.tmpl	22 Jun 2007 21:58:27 -0000
>@@ -27,8 +27,9 @@
> nsNickName: admin
> nsProductVersion: %as_version%
> nsBuildNumber: %as_buildnum%
> nsInstalledLocation: %as_installedlocation%
>+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% Admin istration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot";)
>@@ -43,11 +44,12 @@
> nsServerID: admin-serv
> serverRoot: %as_serverroot%
> 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 || administratorContactInfo || 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";)
>+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
> objectClass: nsConfig
> objectClass: nsAdminConfig
>@@ -72,5 +74,4 @@
> 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";)
>-

Actions: View | Diff

Attachments on bug 244749: 157336 | 157497 | 157506 | 157508 | 157554 | 157578 | 157579 | 157588 | 157662 | 157664 | 157671 | 157769 | 157772 | 157779 | 157978 | 158034 | 158070 | 158071 | 158140 | 158148