Attachment 158147 Details for Bug 245815 – cvs diffs

[patch] cvs diffs

Util.diffs (text/plain), 8.61 KB, created by Noriko Hosoi on 2007-06-28 17:59:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-06-28 17:59:47 UTC

Size: 8.61 KB

patch

obsolete

>===================================================================
>Index: ldap/admin/src/scripts/Util.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
>retrieving revision 1.3
>diff -t -w -U4 -r1.3 Util.pm.in
>--- ldap/admin/src/scripts/Util.pm.in	21 Jun 2007 21:57:23 -0000	1.3
>+++ ldap/admin/src/scripts/Util.pm.in	28 Jun 2007 17:26:58 -0000
>@@ -633,9 +633,12 @@
> # * If the right-hand value is in ` (backquote), the value is eval'ed by perl.
> #   The output should be stored in $returnvalue to pass to the internal hash.
> # * If the right-hand value is in " (doublequote), the value is passed as is.
> # * If the right-hand value is not in any quote, the value should be found
>-#   in either of the setup inf file (static) or the install inf file (dynamic).
>+#   in either of the static inf files or the dynamic inf file.
>+# * The right-hand value could have the format Key:"default_value". 
>+#   In this case, Key is searched in the inf files first.  
>+#   If the Key is not found, the default_value is set.
> # * Variables surrounded by @ (e.g., @admin_confdir@) are replaced with the 
> #   system path at the compile time.
> # * The right-hand value can contain variables surrounded by % (e.g., %asid%)
> #   which refers the right-hand value (key) of this map file.
>@@ -665,29 +668,39 @@
>         }
>         else
>         {
>             # get the value from one of the Inf passed in
>+            # they $value could be pure Key or Key:"default_value"
>+            my ($key_value, $default_value) = split(/:/, $value, 2);
>             my $infsection;
>             foreach my $thisinf (@infdata)
>             {
>                 foreach my $section0 (keys %{$thisinf})
>                 {
>                     $infsection = $thisinf->{$section0};
>                     next if (!ref($infsection));
>-                    if (defined($infsection->{$value}))
>+                    if (defined($infsection->{$key_value}))
>                     {
>-                        $mapper->{$key} = $infsection->{$value};
>+                        $mapper->{$key} = $infsection->{$key_value};
>                         next KEY;
>                     }
>                 }
>             }
>             if (!defined($infsection->{$value}))
>             {
>+                if ($default_value ne "")
>+                {
>+                    $default_value =~ tr/\"//d; # default_value is a regular double quoted string - remove quotes
>+                    $mapper->{$key} = $default_value;
>+                }
>+                else
>+                {
>                 print "ERROR: $value not found in the .inf files\n";
>                 return {};
>             }
>         }
>     }
>+    }
>     return $mapper;
> }
> 
> sub getHashedPassword {
>
>===================================================================
>Index: admserv/newinst/src/configdsroot.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/configdsroot.map.in,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 configdsroot.map.in
>--- admserv/newinst/src/configdsroot.map.in	25 Jun 2007 18:23:53 -0000	1.4
>+++ admserv/newinst/src/configdsroot.map.in	28 Jun 2007 17:28:59 -0000
>@@ -44,8 +44,11 @@
> #   The output should be stored in $returnvalue to pass to the internal hash.
> # * If the right-hand value is in " (doublequote), the value is passed as is.
> # * If the right-hand value is not in any quote, the value should be found
> #   in either of the setup inf file (static) or the install inf file (dynamic).
>+# * The right-hand value could have the format Key:"default_value". 
>+#   In this case, Key is searched in the inf files first. 
>+#   If the Key is not found, the default_value is set.
> # * Variables surrounded by @ (e.g., @configdir@) are replaced with the 
> #   system path at the compile time.
> # * The right-hand value can contain variables surrounded by % (e.g., %asid%)
> #   which refers the right-hand value (key) of this map file.
>@@ -65,9 +68,9 @@
> 
> ds_version =     Version
> ds_baseversion = BaseVersion
> ds_port =        ServerPort
>-ds_secure_port = "636"
>+ds_secure_port = ServerSecurePort:"636"
> ds_suffix =      Suffix
> dsid =           ServerIdentifier
> 
> ds_console_jar = "%normbrand%-ds-%ds_baseversion%.jar"
>
>===================================================================
>Index: admserv/newinst/src/dirserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/dirserver.map.in,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 dirserver.map.in
>--- admserv/newinst/src/dirserver.map.in	28 Jun 2007 16:24:41 -0000	1.5
>+++ admserv/newinst/src/dirserver.map.in	28 Jun 2007 17:28:59 -0000
>@@ -47,8 +47,11 @@
> #   The output should be stored in $returnvalue to pass to the internal hash.
> # * If the right-hand value is in " (doublequote), the value is passed as is.
> # * If the right-hand value is not in any quote, the value should be found
> #   in either of the setup inf file (static) or the install inf file (dynamic).
>+# * The right-hand value could have the format Key:"default_value". 
>+#   In this case, Key is searched in the inf files first. 
>+#   If the Key is not found, the default_value is set.
> # * Variables surrounded by @ (e.g., @configdir@) are replaced with the 
> #   system path at the compile time.
> # * The right-hand value can contain variables surrounded by % (e.g., %asid%)
> #   which refers the right-hand value (key) of this map file.
>@@ -66,9 +69,9 @@
> ds_baseversion =        BaseVersion
> dsid =                  ServerIdentifier
> ds_user =               SuiteSpotUserID
> ds_port =               ServerPort
>-ds_secure_port = "636"
>+ds_secure_port = ServerSecurePort:"636"
> rootdn =                RootDN
> ds_suffix =             Suffix
> ds_buildnum =   BuildNumber
> ds_console_jar ="%normbrand%-ds-%ds_baseversion%.jar"
>
>===================================================================
>Index: admserv/newinst/src/register_param.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/register_param.map.in,v
>retrieving revision 1.5
>diff -t -w -U4 -r1.5 register_param.map.in
>--- admserv/newinst/src/register_param.map.in	28 Jun 2007 16:24:41 -0000	1.5
>+++ admserv/newinst/src/register_param.map.in	28 Jun 2007 17:28:59 -0000
>@@ -47,8 +47,11 @@
> #   The output should be stored in $returnvalue to pass to the internal hash.
> # * If the right-hand value is in " (doublequote), the value is passed as is.
> # * If the right-hand value is not in any quote, the value should be found
> #   in either of the setup inf file (static) or the install inf file (dynamic).
>+# * The right-hand value could have the format Key:"default_value". 
>+#   In this case, Key is searched in the inf files first. 
>+#   If the Key is not found, the default_value is set.
> # * Variables surrounded by @ (e.g., @configdir@) are replaced with the 
> #   system path at the compile time.
> # * The right-hand value can contain variables surrounded by % (e.g., %asid%)
> #   which refers the right-hand value (key) of this map file.
>@@ -83,9 +86,9 @@
> ds_baseversion =        BaseVersion
> dsid =                  ServerIdentifier
> ds_user =               SuiteSpotUserID
> ds_port =               ServerPort
>-ds_secure_port = "636"
>+ds_secure_port = ServerSecurePort:"636"
> rootdn =                RootDN
> ds_suffix =             Suffix
> ds_buildnum =   BuildNumber
> ds_passwd =             RootDNPwd
>
>===================================================================
>Index: admserv/newinst/src/adminserver.map.in
>===================================================================
>RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/adminserver.map.in,v
>retrieving revision 1.4
>diff -t -w -U4 -r1.4 adminserver.map.in
>--- admserv/newinst/src/adminserver.map.in	25 Jun 2007 18:23:53 -0000	1.4
>+++ admserv/newinst/src/adminserver.map.in	28 Jun 2007 17:28:59 -0000
>@@ -47,8 +47,11 @@
> #   The output should be stored in $returnvalue to pass to the internal hash.
> # * If the right-hand value is in " (doublequote), the value is passed as is.
> # * If the right-hand value is not in any quote, the value should be found
> #   in either of the setup inf file (static) or the install inf file (dynamic).
>+# * The right-hand value could have the format Key:"default_value". 
>+#   In this case, Key is searched in the inf files first. 
>+#   If the Key is not found, the default_value is set.
> # * Variables surrounded by @ (e.g., @configdir@) are replaced with the 
> #   system path at the compile time.
> # * The right-hand value can contain variables surrounded by % (e.g., %asid%)
> #   which refers the right-hand value (key) of this map file.

Actions: View | Diff

Attachments on bug 245815: 158147 | 158227 | 158228 | 158229 | 158230 | 158231 | 158235 | 158236 | 158237 | 158238 | 158239 | 158241 | 158266 | 158269 | 158883 | 158885 | 159053 | 159352