Author: nhosoi
Update of /cvs/dirsec/ldapserver/ldap/servers/plugins/rever In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23608/ldap/servers/plugins/rever
Modified Files: des.c Log Message: [208672] parameterizing the hardcoded paths (phase 2. db, log, lock, pid, cert, and instance dir) 1) introduced these 3 new config attributes: nsslapd-lockdir, nsslapd-tmpdir, nsslapd-certdir, and eliminated: nsslapd-instancedir. 2) replaced the hardcoded paths with the corresponding attribute value in the server as well as in the create/remove instance codes. 3) moved snmp stats file to the nsslapd-tmpdir 4) moved the server instance dir to <prefix>/lib/<brand>-ds/slapd-<id>
Index: des.c =================================================================== RCS file: /cvs/dirsec/ldapserver/ldap/servers/plugins/rever/des.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- des.c 19 Apr 2005 22:07:34 -0000 1.5 +++ des.c 13 Oct 2006 01:06:27 -0000 1.6 @@ -214,7 +214,7 @@ CK_MECHANISM pbeMech; CK_MECHANISM cryptoMech;
- char *instancedir = NULL; + char *configdir = NULL; char *iv = NULL;
store = (struct pk11ContextStore*)slapi_ch_malloc(sizeof(*store)); @@ -243,22 +243,22 @@ /* Generate a unique id, used as salt for the key generation */ if ( path == NULL ) { - instancedir = config_get_instancedir(); - if ( instancedir == NULL ) + configdir = config_get_configdir(); + if ( configdir == NULL ) { return (err = SVRCORE_System_Error); } } else { - instancedir = slapi_ch_strdup(path); + configdir = slapi_ch_strdup(path); } - if ( slapi_uniqueIDGenerateFromNameString (&iv, NULL, instancedir, strlen(instancedir)) != UID_SUCCESS ) + if ( slapi_uniqueIDGenerateFromNameString (&iv, NULL, configdir, strlen(configdir)) != UID_SUCCESS ) { - slapi_ch_free((void**)&instancedir); + slapi_ch_free((void**)&configdir); return (err = SVRCORE_System_Error); } - slapi_ch_free((void**)&instancedir); + slapi_ch_free((void**)&configdir);
pwitem = (SECItem *) PORT_Alloc(sizeof(SECItem)); if (pwitem == NULL)
389-commits@lists.fedoraproject.org