[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools/rsearch infadd.c, 1.4, 1.5

[Doctor Conrad]

Author: nkinder

Update of /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18274

Modified Files:
	infadd.c 
Log Message:
Resolves: 336871
Summary: Look for infadd data files in TEMPLATEDIR.



Index: infadd.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/rsearch/infadd.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- infadd.c	18 Oct 2007 00:08:35 -0000	1.4
+++ infadd.c	18 Oct 2007 20:26:58 -0000	1.5
@@ -157,7 +157,7 @@
     AddThread **threads;
     PRUint32 total = 0, ntotal = 0;
     int counter;
-    char familynames[35], givennames[35];
+    char familynames[strlen(TEMPLATEDIR) + 19], givennames[strlen(TEMPLATEDIR) + 18];
 
     srand(time(NULL));
     if (argc < 2) {
@@ -241,14 +241,8 @@
         fill_table(family_names, use_random);
     }
     else {
-        if (!access("../data/dbgen-FamilyNames", R_OK)) {
-            strcpy(familynames, "../data/dbgen-FamilyNames");
-            strcpy(givennames, "../data/dbgen-GivenNames");
-        }
-        else  {
-            strcpy(familynames, "../../data/dbgen-FamilyNames");
-            strcpy(givennames, "../../data/dbgen-GivenNames");
-        }
+        strcpy(familynames, TEMPLATEDIR "/dbgen-FamilyNames");
+        strcpy(givennames, TEMPLATEDIR "/dbgen-GivenNames");
         fprintf(stdout, "Loading Given-Names ...\n");
         if (!nt_load(given_names, givennames)) {
             fprintf(stdout, "*** Failed to read name table\n");