Attachment 157469 Details for Bug 237356 – cvs commit log

cvs commit log

cvsattach (text/plain), 3.46 KB, created by Rich Megginson on 2007-06-20 14:42:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-06-20 14:42:21 UTC

Size: 3.46 KB

patch

obsolete

>Fix Description: Some minor cleanup:
>1) Setup must not write to the user supplied inf file.  Setup uses the user supplied inf to initialize its cache, but creates a tempfile for writing.
>2) When writing an Inf, preserve the continuation lines.
>3) Added Noriko's fix for suffix generation to ds_newinst.pl
>Platforms tested: RHEL4
>Flag Day: No.
>Doc impact: No.
>
>
>Index: Inf.pm
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Inf.pm,v
>retrieving revision 1.2
>retrieving revision 1.3
>diff -u -r1.2 -r1.3
>--- Inf.pm	19 Jun 2007 18:24:57 -0000	1.2
>+++ Inf.pm	20 Jun 2007 14:40:24 -0000	1.3
>@@ -131,7 +131,9 @@
>         print $fh "[$name]\n";
>         for my $key (keys %{$section}) {
>             if (defined($section->{$key})) {
>-                print $fh "$key = ", $section->{$key}, "\n";
>+                my $val = $section->{$key};
>+                $val =~ s/\n/\\\n/g; # make continuation lines
>+                print $fh "$key = $val\n";
>             }
>         }
>     }
>
>
>Index: Setup.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Setup.pm.in,v
>retrieving revision 1.5
>retrieving revision 1.6
>diff -u -r1.5 -r1.6
>--- Setup.pm.in	19 Jun 2007 23:24:58 -0000	1.5
>+++ Setup.pm.in	20 Jun 2007 14:40:24 -0000	1.6
>@@ -132,17 +132,17 @@
>     $self->{preonly} = $preonly;
>     $self->{logfile} = $logfile;
>     $self->{log} = new SetupLog($self->{logfile});
>-    if (!$self->{inffile}) {
>-        my ($fh, $filename) = tempfile("setupXXXXXX", UNLINK => !$keep,
>-                                       SUFFIX => ".inf", OPEN => 0,
>-                                       DIR => File::Spec->tmpdir);
>-        $self->{inffile} = $filename;
>-        $self->{inf} = new Inf;
>-        $self->{inf}->{filename} = $self->{inffile};
>-    } else {
>+    # if user supplied inf file, use that to initialize
>+    if (defined($self->{inffile})) {
>         $self->{inf} = new Inf($self->{inffile});
>-        $self->{keep} = 1; # do not delete user supplied inf file
>     }
>+    my $fh;
>+    # create a temp inf file for writing for other processes
>+    # never overwrite the user supplied inf file
>+    ($fh, $self->{inffile}) = tempfile("setupXXXXXX", UNLINK => !$keep,
>+                                       SUFFIX => ".inf", OPEN => 0,
>+                                       DIR => File::Spec->tmpdir);
>+    $self->{inf}->{filename} = $self->{inffile};
> 
>     # see if user passed in default inf values - also, command line
>     # arguments override those passed in via an inf file - this
>@@ -157,6 +157,8 @@
>         }
>     }
> 
>+    # this is the base config directory - the directory containing
>+    # the slapd-instance instance specific config directories
>     $self->{configdir} = $ENV{DS_CONFIG_DIR} || "@instconfigdir@";
> 
>     $self = bless $self, $type;
>
>Index: ds_newinst.pl.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/ds_newinst.pl.in,v
>retrieving revision 1.9
>retrieving revision 1.10
>diff -u -r1.9 -r1.10
>--- ds_newinst.pl.in	19 Jun 2007 23:24:58 -0000	1.9
>+++ ds_newinst.pl.in	20 Jun 2007 14:40:23 -0000	1.10
>@@ -217,6 +217,7 @@
> if (!$table{slapd}->{Suffix}) {
>     my $suffix = $table{General}->{FullMachineName};
>     # convert fqdn to dc= domain components
>+    $suffix =~ s/^[^\.]*\.//; # just the domain part
>     $suffix = "dc=$suffix";
>     $suffix =~ s/\./, dc=/g;
>     $table{slapd}->{Suffix} = $suffix;

Actions: View

Attachments on bug 237356: 153230 | 153562 | 153667 | 153668 | 153674 | 153675 | 153677 | 153678 | 155103 | 155105 | 155406 | 155407 | 155408 | 155409 | 155410 | 155411 | 155412 | 155413 | 155414 | 155483 | 155484 | 155485 | 155486 | 155487 | 155488 | 155489 | 155490 | 156389 | 156510 | 156525 | 156539 | 156540 | 156541 | 156612 | 156613 | 156614 | 156626 | 156633 | 156634 | 156741 | 156829 | 156834 | 156839 | 156840 | 156895 | 157043 | 157044 | 157133 | 157159 | 157160 | 157164 | 157165 | 157167 | 157298 | 157378 | 157381 | 157388 | 157390 | 157400 | 157401 | 157407 | 157408 | 157429 | 157431 | 157469 | 157471 | 157479 | 157480 | 160762