diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2007-06-19 23:24:58 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2007-06-19 23:24:58 +0000 |
| commit | 4f756867c628ae34811c055fdcc13fc82cacf0db (patch) | |
| tree | e7fd87af015c55aa08bcf5870e80aca22dbcefa0 | |
| parent | 0e18cd2f56c68e0eb78ff9191a4ea78f436eeca4 (diff) | |
| download | ds-4f756867c628ae34811c055fdcc13fc82cacf0db.tar.gz ds-4f756867c628ae34811c055fdcc13fc82cacf0db.tar.xz ds-4f756867c628ae34811c055fdcc13fc82cacf0db.zip | |
Resolves: bug 237356
Bug Description: Move DS Admin Code into Admin Server - admin server setup
Fix Description: Allow the use of '-' and '_' in section and parameter names when passing in inf parameters via the command line.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
| -rw-r--r-- | ldap/admin/src/ds_newinst.pl.in | 2 | ||||
| -rw-r--r-- | ldap/admin/src/scripts/Setup.pm.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ldap/admin/src/ds_newinst.pl.in b/ldap/admin/src/ds_newinst.pl.in index 817c4a93..974e14c1 100644 --- a/ldap/admin/src/ds_newinst.pl.in +++ b/ldap/admin/src/ds_newinst.pl.in @@ -189,7 +189,7 @@ usage("No arguments given") if (!@ARGV); # process command line arguments for (@ARGV) { - if (/^(\w+)\.(\w+)=(.*)$/) { # e.g. section.param=value + if (/^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value $table{$1}->{$2} = $3; } else { # file? readInfFile($_); diff --git a/ldap/admin/src/scripts/Setup.pm.in b/ldap/admin/src/scripts/Setup.pm.in index f1a60719..dd2b5b64 100644 --- a/ldap/admin/src/scripts/Setup.pm.in +++ b/ldap/admin/src/scripts/Setup.pm.in @@ -148,7 +148,7 @@ sub new { # arguments override those passed in via an inf file - this # allows the reuse of .inf files with some parameters overridden for (@ARGV) { - if (/^(\w_-+)\.(\w_-+)=(.*)$/) { # e.g. section.param=value + if (/^([\w_-]+)\.([\w_-]+)=(.*)$/) { # e.g. section.param=value $self->{inf}->{$1}->{$2} = $3; } else { # error print STDERR "Error: unknown command line option $_\n"; |