diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2009-09-09 17:01:49 -0600 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2009-09-21 10:28:50 -0600 |
| commit | cc89083f1177606d4cbbb52f8cdc5e34d0d16f70 (patch) | |
| tree | 2cfebaacc69bc8fe416938b4bf9fbb51c73725eb /ldap/admin/src/scripts/Resource.pm | |
| parent | 2de80f5fb3398045dc7a25f5d25dfd7dd30c8909 (diff) | |
| download | ds-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/Resource.pm')
| -rw-r--r-- | ldap/admin/src/scripts/Resource.pm | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ldap/admin/src/scripts/Resource.pm b/ldap/admin/src/scripts/Resource.pm index 1fcd44ca..911ab087 100644 --- a/ldap/admin/src/scripts/Resource.pm +++ b/ldap/admin/src/scripts/Resource.pm @@ -77,27 +77,28 @@ sub read { my $incontinuation = 0; my $curkey; open RES, $filename or die "Error: could not open resource file $filename: $!"; - while (<RES>) { + my $line; + while ($line = <RES>) { 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; } # read name = value pairs like this # bol whitespace* name whitespace* '=' whitespace* value eol # the value will include any trailing whitespace - if (/\\$/) { - chop; + if ($line =~ /\\$/) { + chop $line; $iscontinuation = 1; } if ($incontinuation) { - $self->{res}->{$curkey} .= "\n" . $_; - } elsif (/^\s*(.*?)\s*=\s*(.*?)$/) { + $self->{res}->{$curkey} .= "\n" . $line; + } elsif ($line =~ /^\s*(.*?)\s*=\s*(.*?)$/) { # replace \n with real newline if ($curkey) { $self->{res}->{$curkey} =~ s/\\n/\n/g; |
