summaryrefslogtreecommitdiffstats
path: root/ldap/admin/src/scripts/Inf.pm
diff options
context:
space:
mode:
authorRich Megginson <rmeggins@redhat.com>2009-09-09 17:01:49 -0600
committerRich Megginson <rmeggins@redhat.com>2009-09-21 10:28:50 -0600
commitcc89083f1177606d4cbbb52f8cdc5e34d0d16f70 (patch)
tree2cfebaacc69bc8fe416938b4bf9fbb51c73725eb /ldap/admin/src/scripts/Inf.pm
parent2de80f5fb3398045dc7a25f5d25dfd7dd30c8909 (diff)
downloadds-cc89083f1177606d4cbbb52f8cdc5e34d0d16f70.tar.gz
ds-cc89083f1177606d4cbbb52f8cdc5e34d0d16f70.tar.xz
ds-cc89083f1177606d4cbbb52f8cdc5e34d0d16f70.zip
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
Diffstat (limited to 'ldap/admin/src/scripts/Inf.pm')
-rw-r--r--ldap/admin/src/scripts/Inf.pm27
1 files changed, 14 insertions, 13 deletions
diff --git a/ldap/admin/src/scripts/Inf.pm b/ldap/admin/src/scripts/Inf.pm
index 091940be..bb229137 100644
--- a/ldap/admin/src/scripts/Inf.pm
+++ b/ldap/admin/src/scripts/Inf.pm
@@ -88,31 +88,32 @@ sub read {
}
$inffh = \*INF;
}
- while (<$inffh>) {
+ my $line;
+ while ($line = <$inffh>) {
my $iscontinuation;
- chop; # trim trailing newline
- if (/^\s*$/) { # skip blank/empty lines
+ chop $line; # trim trailing newline
+ if ($line =~ /^\s*$/) { # skip blank/empty lines
$incontinuation = 0;
next;
}
- if (/^\s*\#/) { # skip comment lines
+ if ($line =~ /^\s*\#/) { # skip comment lines
$incontinuation = 0;
next;
}
- if (/\\$/) { # line ends in \ - continued on next line
- chop;
+ if ($line =~ /\\$/) { # line ends in \ - continued on next line
+ chop $line;
$iscontinuation = 1;
}
if ($incontinuation) {
if ($curval) {
- $self->{$curSection}->{$curkey}->[$curval] .= "\n" . $_; # add line in entirety to current value
+ $self->{$curSection}->{$curkey}->[$curval] .= "\n" . $line; # add line in entirety to current value
} else {
- $self->{$curSection}->{$curkey} .= "\n" . $_; # add line in entirety to current value
+ $self->{$curSection}->{$curkey} .= "\n" . $line; # add line in entirety to current value
}
- } elsif (/^\[(.*?)\]/) { # e.g. [General]
+ } elsif ($line =~ /^\[(.*?)\]/) { # e.g. [General]
$curSection = $1;
$iscontinuation = 0; # disallow section continuations
- } elsif (/^\s*(.*?)\s*=\s*(.*?)\s*$/) { # key = value
+ } elsif ($line =~ /^\s*(.*?)\s*=\s*(.*?)\s*$/) { # key = value
$curkey = $1;
# a single value is just a single scalar
# multiple values are represented by an array ref
@@ -207,8 +208,8 @@ sub updateFromArgs {
}
# read args into temp inf
- for (@_) {
- if (/^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value
+ for my $arg (@_) {
+ if ($arg =~ /^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value
my $sec = $1;
my $parm = $2;
my $val = $3;
@@ -227,7 +228,7 @@ sub updateFromArgs {
$argsinf->{$sec}->{$parm} = $val;
}
} else { # error
- print STDERR "Error: unknown command line option $_\n";
+ print STDERR "Error: unknown command line option $arg\n";
return;
}
}