Add update code - make setup-ds.pl -u do updates

Updates are implemented in:
perl - code that plugs in to setup - scriptlets that are imported into
the setup perl interpreter and executed in process, giving access to all
of the packages and context provided by setup
ldif - applied to instances, in the same manner as ConfigFile directives
to setup
other - any executable file, shell script, etc. can be invoked, with a limited
amount of context from the setup process
An update directory is added to the package - /usr/share/dirsrv/update - this
directory contains the update files - the update filenames begin with two digits
and are executed in numeric order (00 first, then 01, etc. up to 99) which
should provide enough flexibility
In addition, there are 5 stages of update:
pre - invoked before any instance specific code
preinst, runinst, postinst - invoked for each instance
post - invoked after any instance specific code
Example files are provided which demonstrate how to get the context.
There are two different modes of operation for update:
online - must supply a bind dn and password for each instance - servers must
be up and running
offline - operates directly on the dse.ldif - servers must be shutdown first
A new section is added to the .inf file that can be passed in

[slapd-instancename]
RootDN = binddn
RootDNPwd = bindpw

The RootDN is optional - if not supplied, it will get the nsslapd-rootdn attribute from the dse.ldif for the instance.
I also fixed some problems with error messages.
The pam pta plugin entry was giving object class violations, so I added the
missing attributes - note that these are replaced by the plugin code when
the plugin is loaded - they are only needed during setup.

Fixed usage of $_ - $_ behaves like a dynamically scoped variable - which
means if you use it in an outer context, you cannot use it in an inner
context, even if it is used in a different function.  Rather than attempting
to figure out how to use $_ safely in lower level functions, I just removed
the use of it altogether, which also makes the code easier to read.
Reviewed by: nhosoi (Thanks!) - fixed minor issues found
Platforms tested: Fedora 11

1 files changed, 34 insertions, 10 deletions

diff --git a/ldap/admin/src/scripts/Setup.pm.in b/ldap/admin/src/scripts/Setup.pm.in
index 7ad57c1f..5927d40b 100644
--- a/ldap/admin/src/scripts/Setup.pm.in
+++ b/ldap/admin/src/scripts/Setup.pm.in
@@ -99,6 +99,8 @@ options:
     --file=name  Use the file 'name' in .inf format to supply the default answers
     --keepcache  Do not delete the temporary .inf file generated by this program
     --logfile    Log setup messages to this file - otherwise, a temp file will be used
+    --update     Update an existing installation (e.g. after upgrading packages)
+    --continue   (update only) keep going despite errors (also --force)
 For all options, you can also use the short name e.g. -h, -d, etc.  For the -d argument,
 specifying it more than once will increase the debug level e.g. -ddddd
 
@@ -124,7 +126,7 @@ sub new {
 sub init {
     my $self = shift;
     $self->{res} = shift;
-    my ($silent, $inffile, $keep, $preonly, $logfile, $update);
+    my ($silent, $inffile, $keep, $preonly, $logfile, $update, $force);
 
     GetOptions('help|h|?' => sub { VersionMessage(); HelpMessage(); exit 0 },
                'version|v' => sub { VersionMessage(); exit 0 },
@@ -134,7 +136,8 @@ sub init {
                'keepcache|k' => \$keep,
                'preonly|p' => \$preonly,
                'logfile|l=s' => \$logfile,
-               'update|u' => \$update
+               'update|u' => \$update,
+               'continue|force|c' => \$force
                );
 
     $self->{silent} = $silent;
@@ -142,6 +145,7 @@ sub init {
     $self->{keep} = $keep;
     $self->{preonly} = $preonly;
     $self->{update} = $update;
+    $self->{force} = $force;
     $self->{logfile} = $logfile;
     $self->{log} = new SetupLog($self->{logfile});
     # if user supplied inf file, use that to initialize
@@ -193,21 +197,40 @@ sub log {
 sub msg {
     my $self = shift;
     my $level = shift;
-    my @text = @_;
-    if (!$level && @text) {
+    my @ary = @_;
+    if (!$level && @ary) {
         # e.g. msg(0, "string") - no logging
-    } elsif ($level and @text and grep {/^$level$/} $self->{log}->levels()) {
+    } elsif ($level and @ary and grep {/^$level$/} $self->{log}->levels()) {
         # e.g. msg($WARN, "string") - print and log
     } else {
         # log at default INFO level
-        unshift @text, $level;
+        unshift @ary, $level;
         $level = $INFO;
     }
-    my $string = $self->{res}->getText(@text);
-    if ($level) {
-        $self->log($level, $string);
+    # @text is an array of strings for one message or 
+    # an array of array refs, each one is a message
+    while (@ary) {
+        my @text = shift @ary;
+
+        last if (!@text or !$text[0]);
+
+        # element is an array ref - just pass to getText
+        # else is a list of strings
+        # NOTE: this will NOT work if ary contains
+        # consecutive simple string errors not separated
+        # by an array ref e.g. this will work
+        # ARRAY, 'errkey', arg, arg, ARRAY
+        # this will not work
+        # ARRAY, 'errkey', arg, 'errkey2', arg2, ARRAY
+        while (@ary and !ref($ary[0])) {
+            push @text, shift @ary;
+        }
+        my $string = $self->{res}->getText(@text);
+        if ($level) {
+            $self->log($level, $string);
+        }
+        print $string;
     }
-    print $string;
 }
 
 sub doExit {
@@ -231,6 +254,7 @@ sub getDirServers {
     if (!$self->{dirservers}) {
         $self->{dirservers} = [];
         for my $dir (glob("$self->{configdir}/slapd-*")) {
+            next if ($dir =~ /\.removed$/); # skip removed instances
             if (-d $dir) {
                 $dir =~ s,$self->{configdir}/,,; # strip off dir part
                 push @{$self->{dirservers}}, $dir;