Attachment 311741 Details for Bug 431103 – diffs

[patch] diffs

diffs.bug431103 (text/plain), 2.07 KB, created by Rich Megginson on 2008-07-14 17:33:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2008-07-14 17:33:32 UTC

Size: 2.07 KB

patch

obsolete

>Index: ldapserver/ldap/admin/src/scripts/Setup.pm.in
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Setup.pm.in,v
>retrieving revision 1.10
>diff -u -8 -r1.10 Setup.pm.in
>--- ldapserver/ldap/admin/src/scripts/Setup.pm.in	7 Sep 2007 15:02:25 -0000	1.10
>+++ ldapserver/ldap/admin/src/scripts/Setup.pm.in	14 Jul 2008 17:33:04 -0000
>@@ -119,32 +119,34 @@
>     $self = bless $self, $type;
>     $self->init(@_);
>     return $self;
> }
> 
> sub init {
>     my $self = shift;
>     $self->{res} = shift;
>-    my ($silent, $inffile, $keep, $preonly, $logfile);
>+    my ($silent, $inffile, $keep, $preonly, $logfile, $update);
> 
>     GetOptions('help|h|?' => sub { VersionMessage(); HelpMessage(); exit 0 },
>                'version|v' => sub { VersionMessage(); exit 0 },
>                'debug|d+' => \$Util::debuglevel,
>                'silent|s' => \$silent,
>                'file|f=s' => \$inffile,
>                'keepcache|k' => \$keep,
>                'preonly|p' => \$preonly,
>-               'logfile|l=s' => \$logfile
>+               'logfile|l=s' => \$logfile,
>+               'update|u' => \$update
>                );
> 
>     $self->{silent} = $silent;
>     $self->{inffile} = $inffile;
>     $self->{keep} = $keep;
>     $self->{preonly} = $preonly;
>+    $self->{update} = $update;
>     $self->{logfile} = $logfile;
>     $self->{log} = new SetupLog($self->{logfile});
>     # if user supplied inf file, use that to initialize
>     if (defined($self->{inffile})) {
>         $self->{inf} = new Inf($self->{inffile});
>     } else {
>         $self->{inf} = new Inf;
>     }
>@@ -246,16 +248,17 @@
> 
> # get a list of the directory servers in configdir
> sub getDirServers {
>     my $self = shift;
>     if (!$self->{dirservers}) {
>         $self->{dirservers} = [];
>         for my $dir (glob("$self->{configdir}/slapd-*")) {
>             if (-d $dir) {
>+                $dir =~ s,$self->{configdir}/,,; # strip off dir part
>                 push @{$self->{dirservers}}, $dir;
>             }
>         }
>     }
>     return @{$self->{dirservers}};
> }
> 
>

Actions: View | Diff

Attachments on bug 431103: 311740 | 311741 | 311748 | 311760