|
@@ -124,7 +124,7 @@ sub new {
|
|
|
sub init {
|
|
sub init {
|
|
|
my $self = shift;
|
|
my $self = shift;
|
|
|
$self->{res} = 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 },
|
|
GetOptions('help|h|?' => sub { VersionMessage(); HelpMessage(); exit 0 },
|
|
|
'version|v' => sub { VersionMessage(); exit 0 },
|
|
'version|v' => sub { VersionMessage(); exit 0 },
|
|
@@ -133,13 +133,15 @@ sub init {
|
|
|
'file|f=s' => \$inffile,
|
|
'file|f=s' => \$inffile,
|
|
|
'keepcache|k' => \$keep,
|
|
'keepcache|k' => \$keep,
|
|
|
'preonly|p' => \$preonly,
|
|
'preonly|p' => \$preonly,
|
|
|
- 'logfile|l=s' => \$logfile
|
|
|
|
|
|
|
+ 'logfile|l=s' => \$logfile,
|
|
|
|
|
+ 'update|u' => \$update
|
|
|
);
|
|
);
|
|
|
|
|
|
|
|
$self->{silent} = $silent;
|
|
$self->{silent} = $silent;
|
|
|
$self->{inffile} = $inffile;
|
|
$self->{inffile} = $inffile;
|
|
|
$self->{keep} = $keep;
|
|
$self->{keep} = $keep;
|
|
|
$self->{preonly} = $preonly;
|
|
$self->{preonly} = $preonly;
|
|
|
|
|
+ $self->{update} = $update;
|
|
|
$self->{logfile} = $logfile;
|
|
$self->{logfile} = $logfile;
|
|
|
$self->{log} = new SetupLog($self->{logfile});
|
|
$self->{log} = new SetupLog($self->{logfile});
|
|
|
# if user supplied inf file, use that to initialize
|
|
# if user supplied inf file, use that to initialize
|
|
@@ -251,6 +253,7 @@ sub getDirServers {
|
|
|
$self->{dirservers} = [];
|
|
$self->{dirservers} = [];
|
|
|
for my $dir (glob("$self->{configdir}/slapd-*")) {
|
|
for my $dir (glob("$self->{configdir}/slapd-*")) {
|
|
|
if (-d $dir) {
|
|
if (-d $dir) {
|
|
|
|
|
+ $dir =~ s,$self->{configdir}/,,; # strip off dir part
|
|
|
push @{$self->{dirservers}}, $dir;
|
|
push @{$self->{dirservers}}, $dir;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|