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, 30 insertions, 21 deletions

diff --git a/ldap/admin/src/scripts/DSCreate.pm.in b/ldap/admin/src/scripts/DSCreate.pm.in
index 15302b9c..a7ab5fae 100644
--- a/ldap/admin/src/scripts/DSCreate.pm.in
+++ b/ldap/admin/src/scripts/DSCreate.pm.in
@@ -64,8 +64,8 @@ use Mozilla::LDAP::LDIF;
 
 use Exporter;
 @ISA       = qw(Exporter);
-@EXPORT    = qw(createDSInstance removeDSInstance);
-@EXPORT_OK = qw(createDSInstance removeDSInstance);
+@EXPORT    = qw(createDSInstance removeDSInstance setDefaults createInstanceScripts installSchema);
+@EXPORT_OK = qw(createDSInstance removeDSInstance setDefaults createInstanceScripts installSchema);
 
 use strict;
 
@@ -207,9 +207,9 @@ sub makeDSDirs {
     # more privileged user than the directory server, but
     # still allows the admin server to manage directory
     # server files/dirs without being root
-    for (qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir
+    for my $kw (qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir
             cert_dir db_dir ldif_dir bak_dir)) {
-        my $dir = $inf->{slapd}->{$_};
+        my $dir = $inf->{slapd}->{$kw};
         @errs = makePaths($dir, $mode, $inf->{General}->{SuiteSpotUserID},
                           $inf->{General}->{SuiteSpotGroup});
         if (@errs) {
@@ -240,8 +240,8 @@ sub makeDSDirs {
     }
     # set the group of the parent dir of config_dir and inst_dir
     if (defined($inf->{General}->{SuiteSpotGroup})) {
-        for (qw(inst_dir config_dir)) {
-            my $dir = $inf->{slapd}->{$_};
+        for my $kw (qw(inst_dir config_dir)) {
+            my $dir = $inf->{slapd}->{$kw};
             my $parent = dirname($dir);
                   # changeOwnerMode(inf, mode, file, gidonly & default mode);
             @errs = changeOwnerMode($inf, 7, $parent, 5);
@@ -256,6 +256,7 @@ sub makeDSDirs {
 
 sub createInstanceScripts {
     my $inf = shift;
+    my $skip = shift;
     my $perlexec = "@perlexec@" || "/usr/bin/env perl";
     my $myperl = "!$perlexec";
     my $mydevnull = (-f "/dev/null" ? " /dev/null " : " NUL ");
@@ -280,18 +281,21 @@ sub createInstanceScripts {
     );
 
     my $dir = "$inf->{General}->{prefix}@taskdir@";
-    for (glob("$dir/template-*")) {
-        my $basename = $_;
+    for my $file (glob("$dir/template-*")) {
+        my $basename = $file;
         $basename =~ s/^.*template-//;
         my $destfile = "$inf->{slapd}->{inst_dir}/$basename";
-        if (!open(SRC, "< $_")) {
-            return ("error_opening_scripttmpl", $_, $!);
+
+        next if ($skip and -f $destfile); # in skip mode, skip files that already exist
+
+        if (!open(SRC, "< $file")) {
+            return ("error_opening_scripttmpl", $file, $!);
         }
         if (!open(DEST, "> $destfile")) {
             return ("error_opening_scripttmpl", $destfile, $!);
         }
         my $contents; # slurp entire file into memory
-        read SRC, $contents, int(-s $_);
+        read SRC, $contents, int(-s $file);
         close(SRC);
         while (my ($key, $val) = each %maptable) {
             $contents =~ s/\{\{$key\}\}/$val/g;
@@ -482,6 +486,7 @@ sub makeOtherConfigFiles {
 
 sub installSchema {
     my $inf = shift;
+    my $skip = shift;
     my @errs;
     my @schemafiles = ();
     if (!defined($inf->{slapd}->{install_full_schema}) or
@@ -499,10 +504,13 @@ sub installSchema {
             push @schemafiles, $inf->{slapd}->{SchemaFile};
         }
     }
-    for (@schemafiles) {
-        my $src = $_;
+    for my $file (@schemafiles) {
+        my $src = $file;
         my $basename = basename($src);
         my $dest = "$inf->{slapd}->{schema_dir}/$basename";
+
+        next if ($skip and -f $dest); # skip files that already exist
+
         $! = 0; # clear errno
         copy($src, $dest);
         if ($!) {
@@ -667,17 +675,18 @@ sub startServer {
     }
         
     my $pos = tell(IN);
+    my $line;
     while (($done == 0) && (time < $timeout)) {
-        for (; ($done == 0) && ($_ = <IN>); $pos = tell(IN)) {
-            $lastLine = $_;
-            debug(1, $_);
-            if (/$cmdPat/) {
+        for (; ($done == 0) && ($line = <IN>); $pos = tell(IN)) {
+            $lastLine = $line;
+            debug(1, $line);
+            if ($line =~ /$cmdPat/) {
                 $done = 1;
                 $started = 1;
-            } elsif (/Initialization Failed/) {
+            } elsif ($line =~ /Initialization Failed/) {
                 debug(1, "Server failed to start, retrying . . .\n");
                 $code = system($startcmd);
-            } elsif (/exiting\./) {
+            } elsif ($line =~ /exiting\./) {
                 debug(1, "Server failed to start, retrying . . .\n");
                 $code = system($startcmd);
             }
@@ -894,9 +903,9 @@ sub updateSelinuxPolicy {
     # if selinux is not available, do nothing
     if ("@with_selinux@") {
         # run restorecon on all directories we created
-        for (qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir
+        for my $kw (qw(inst_dir config_dir schema_dir log_dir lock_dir run_dir tmp_dir
                 cert_dir db_dir ldif_dir bak_dir)) {
-            my $dir = $inf->{slapd}->{$_};
+            my $dir = $inf->{slapd}->{$kw};
             system("restorecon -R $dir");
         }