[Fedora-directory-commits] ldapserver/ldap/servers/slapd/tools pwenc.c, 1.6, 1.7

[Noriko Hosoi (nhosoi)]

Author: nhosoi

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

Modified Files:
	pwenc.c 
Log Message:
[207427] parameterizing the hardcoded paths (Comment #15)
phase 1. parameterizing config, schema and ldif directory



Index: pwenc.c
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/servers/slapd/tools/pwenc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pwenc.c	11 Apr 2006 02:14:51 -0000	1.6
+++ pwenc.c	27 Sep 2006 23:40:52 -0000	1.7
@@ -82,7 +82,7 @@
 usage( name )
 char	*name;
 {
-    fprintf( stderr, "usage: %s -D instance-dir [-H] [-s scheme | -c comparepwd ] password...\n", name );
+    fprintf( stderr, "usage: %s -D config-dir [-H] [-s scheme | -c comparepwd ] password...\n", name );
     exit( 1 );
 }
 
@@ -133,7 +133,7 @@
 	slapdFrontendConfig_t *slapdFrontendConfig =  NULL;
 
 	char *opts = "Hs:c:D:";
-	char *instancedir = NULL;
+	char *configdir = NULL;
     name = argv[ 0 ];
     pwsp = cmppwsp = NULL;
 
@@ -157,13 +157,13 @@
 			/* kexcoff: quite the same as slapd_bootstrap_config */
 			FrontendConfig_init();
 
-			instancedir = rel2abspath( optarg );
-			if ( config_set_instancedir( "configdir (-D)", instancedir,
+			configdir = rel2abspath( optarg );
+			if ( config_set_configdir( "configdir (-D)", configdir,
 						errorbuf, 1) != LDAP_SUCCESS ) {
 				fprintf( stderr, "%s\n", errorbuf );
 				return( 1 );
 			}
-			slapi_ch_free((void **)&instancedir);
+			slapi_ch_free((void **)&configdir);
 
 
 			slapdFrontendConfig = getFrontendConfig();