Attachment 157772 Details for Bug 244749 – cvs diffs

cvs diffs

244749-2.diffs (text/plain), 7.83 KB, created by Noriko Hosoi on 2007-06-25 18:07:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-25 18:07:45 UTC

Size: 7.83 KB

patch

obsolete

>Index: newinst/src/adminserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
>retrieving revision 1.3
>diff -t -w -U4 -r1.3 adminserver.map.in
>--- newinst/src/adminserver.map.in	22 Jun 2007 22:26:24 -0000	1.3
>+++ newinst/src/adminserver.map.in	25 Jun 2007 17:57:56 -0000
>@@ -72,7 +72,5 @@
> as_user =               SysUser
> as_version =    Version
> as_baseversion =        BaseVersion
> as_buildnum =   BuildNumber
>-as_installedlocation =  "AS INSTALLED LOCATION -- replace me"
>-as_serverroot = "AS SERVER ROOT-- replace me"
> as_sie =                "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>Index: newinst/src/configdsroot.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v
>retrieving revision 1.3
>diff -t -w -U4 -r1.3 configdsroot.map.in
>--- newinst/src/configdsroot.map.in	25 Jun 2007 17:14:40 -0000	1.3
>+++ newinst/src/configdsroot.map.in	25 Jun 2007 17:57:56 -0000
>@@ -55,9 +55,8 @@
> brand =          Brand
> normbrand =      NormBrand
> 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"
> 
> as_uid =          ServerAdminID
> as_passwd =      ServerAdminPwd
> asid =           `use Net::Domain qw(hostname); $returnvalue = hostname();`
>Index: newinst/src/dirserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
>retrieving revision 1.3
>diff -t -w -U4 -r1.3 dirserver.map.in
>--- newinst/src/dirserver.map.in	22 Jun 2007 22:26:24 -0000	1.3
>+++ newinst/src/dirserver.map.in	25 Jun 2007 17:57:56 -0000
>@@ -58,9 +58,8 @@
> 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"
> ds_version =    Version
>@@ -72,7 +71,5 @@
> rootdn =                RootDN
> ds_suffix =             Suffix
> ds_buildnum =   BuildNumber
> ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
>-ds_installedlocation =  "DS INSTALLED LOCATION -- replace me"
>-ds_serverroot = "DS SERVER ROOT-- replace me"
> ds_sie =                "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>Index: newinst/src/register_param.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
>retrieving revision 1.3
>diff -t -w -U4 -r1.3 register_param.map.in
>--- newinst/src/register_param.map.in	22 Jun 2007 22:26:24 -0000	1.3
>+++ newinst/src/register_param.map.in	25 Jun 2007 17:57:56 -0000
>@@ -60,9 +60,8 @@
> hostname =              `use Net::Domain qw(hostname); $returnvalue = hostname();`
> 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
>@@ -77,10 +76,8 @@
> as_user =               SysUser
> as_version =    Version
> as_baseversion =        BaseVersion
> as_buildnum =   BuildNumber
>-as_installedlocation =  "AS INSTALLED LOCATION -- replace me"
>-as_serverroot = "AS SERVER ROOT-- replace me"
> as_sie =                "cn=admin-serv-%asid%, cn=%brand% Administration Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
> 
> ds_version =    Version
> ds_baseversion =        BaseVersion
>@@ -92,7 +89,5 @@
> ds_suffix =             Suffix
> ds_buildnum =   BuildNumber
> ds_passwd =             RootDNPwd
> ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
>-ds_installedlocation =  "DS INSTALLED LOCATION -- replace me"
>-ds_serverroot = "DS SERVER ROOT-- replace me"
> ds_sie =                "cn=slapd-%dsid%, cn=%brand% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot"
>Index: schema/ldif/01nsroot.ldif.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/01nsroot.ldif.tmpl,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 01nsroot.ldif.tmpl
>--- schema/ldif/01nsroot.ldif.tmpl	22 Jun 2007 22:26:25 -0000	1.5
>+++ schema/ldif/01nsroot.ldif.tmpl	25 Jun 2007 17:57:56 -0000
>@@ -113,9 +113,8 @@
> objectClass: groupOfUniqueNames
> objectClass: nsDirectoryInfo
> objectClass: top
> nsAdminGroupName: Server Group
>-nsConfigRoot: %configroot%
> 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% Directory Server, cn=Server Group, cn=%fqdn%, ou=%domain%, o=NetscapeRoot
>Index: schema/ldif/10dsdata.ldif.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/10dsdata.ldif.tmpl,v
>retrieving revision 1.6
>diff -t -w -U4 -r1.6 10dsdata.ldif.tmpl
>--- schema/ldif/10dsdata.ldif.tmpl	22 Jun 2007 22:26:25 -0000	1.6
>+++ schema/ldif/10dsdata.ldif.tmpl	25 Jun 2007 17:57:56 -0000
>@@ -31,9 +31,8 @@
> nsProductVersion: %ds_version%
> 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
>@@ -50,9 +49,8 @@
> nsServerSecurity: off
> nsServerID: slapd-%dsid%
> nsBindDN: %rootdn%
> nsBaseDN: %ds_suffix%
>-serverRoot: %ds_serverroot%
> nsServerPort: %ds_port%
> nsSecureServerPort: %ds_secure_port%
> serverProductName: Directory Server (%dsid%)
> serverVersionNumber: %ds_version%
>Index: schema/ldif/20asdata.ldif.tmpl
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/schema/ldif/20asdata.ldif.tmpl,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 20asdata.ldif.tmpl
>--- schema/ldif/20asdata.ldif.tmpl	22 Jun 2007 22:26:25 -0000	1.4
>+++ schema/ldif/20asdata.ldif.tmpl	25 Jun 2007 17:57:56 -0000
>@@ -26,9 +26,8 @@
> nsProductName: %brand% Administration Server
> 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
>@@ -41,9 +40,8 @@
> objectClass: nsResourceRef
> objectClass: groupOfUniqueNames
> cn: admin-serv-%asid%
> 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

Actions: View

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