diff options
author | Rich Megginson <rmeggins@redhat.com> | 2007-07-16 16:49:41 +0000 |
---|---|---|
committer | Rich Megginson <rmeggins@redhat.com> | 2007-07-16 16:49:41 +0000 |
commit | 1190f204bf5e3a18e759dbb6308e2e7e17dfba2a (patch) | |
tree | 35faef2d5ccf429c67d4b997dba1b77a018a98b4 /ldap/servers/slapd/tools | |
parent | 99500fdbe2c14ed53bce3ac26b7a705255a5c269 (diff) | |
download | ds-1190f204bf5e3a18e759dbb6308e2e7e17dfba2a.tar.gz ds-1190f204bf5e3a18e759dbb6308e2e7e17dfba2a.tar.xz ds-1190f204bf5e3a18e759dbb6308e2e7e17dfba2a.zip |
Resolves: bug 248272
Description: CLU: dbgen.pl fails to load data files
Reviewed by: nhosoi (Thanks!)
Fix Description: dbgen.pl is hardcoded to look for data files in ../data. Instead, we should allow the user to provide the location to the data files e.g. -l /path/to/data, and we should also use share/brand-ds/data as the default directory.
Diffstat (limited to 'ldap/servers/slapd/tools')
-rwxr-xr-x | ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl.in (renamed from ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl) | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl b/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl.in index a08905d1..43f5e5de 100755 --- a/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl +++ b/ldap/servers/slapd/tools/rsearch/scripts/dbgen.pl.in @@ -62,12 +62,13 @@ sub PrintUsage { "\t Where options are:\n", "\t -s suffix, default is 'dc=example,dc=com'\n", "\t -c for CN naming style RDN's : default is UID\n", - "\t -O for organizationalPersons, default is inetOrgPerson\n", + "\t -O for organizationalPersons, default is inetOrgPerson\n", "\t -p for piranha style aci's, default is barracuda\n", "\t -r seed---seed number for random number generator\n", "\t -g print extra entries for orgchart\n", "\t -x suppress printing pre amble\n", "\t -y suppress printing organizational units\n", + "\t -l location of directory containing data files, default is @templatedir@\n", "\t -v verbose\n", "\t -q quiet\n", "\n"; @@ -528,7 +529,7 @@ my $mycert = require "flush.pl"; require "getopts.pl"; -&Getopts('n:o:s:r:cOvpqgxy'); +&Getopts('n:o:s:r:cOvpqgxyl:'); $Number_To_Generate = $opt_n; $Verbose = $opt_v; @@ -542,6 +543,7 @@ $NamingType = "cn" if ($opt_c); $NamingType = "uid" if (!$opt_c); $inetOrgPerson = "objectClass: inetOrgPerson\n" if (!$opt_O); $PrintOrgChartDat = $opt_g; +$DataDir = $opt_l || "@templatedir@"; $printpreamble = 1; if ("" != $opt_x) { @@ -582,10 +584,9 @@ srand($Random_Seed); print "Loading Name Data...\n" if $Verbose; -$DATADIR = "../data"; -$GivenNamesFile = "$DATADIR/dbgen-GivenNames"; -$FamilyNamesFile = "$DATADIR/dbgen-FamilyNames"; -$OrgUnitsFile = "$DATADIR/dbgen-OrgUnits"; +$GivenNamesFile = "$DataDir/dbgen-GivenNames"; +$FamilyNamesFile = "$DataDir/dbgen-FamilyNames"; +$OrgUnitsFile = "$DataDir/dbgen-OrgUnits"; &ReadGivenNames; &ReadFamilyNames; &ReadOrgUnits; |