mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2024-12-15 03:01:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix previous change to getRegParam, SERVICE_NAME is only known in slapd.

Browse Source
This commit is contained in:
Howard Chu 2000-05-12 21:26:30 +00:00
parent 3dc83998c0
commit 9a79d03e13
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/liblutil/ntservice.c
View File

@ -293,7 +293,7 @@ void *getRegParam( char *svc, char *value )
static char vValue[1024];
DWORD valLen = sizeof( vValue );
if ( svc && strcmp(svc, SERVICE_NAME) )
if ( svc != NULL )
sprintf ( path, "SOFTWARE\\%s", svc );
else
strcpy (path, "SOFTWARE\\OpenLDAP\\Parameters" );

9
servers/slapd/main.c
View File

@ -172,20 +172,23 @@ int main( int argc, char **argv )
int *i;
char *newConfigFile;
char *newUrls;
char *regService = NULL;
if ( is_NT_Service ) {
NTservice = argv[0];
CommenceStartupProcessing( NTservice, slap_sig_shutdown );
if ( strcmp(NTservice, SERVICE_NAME) )
regService = NTservice;
}
i = (int*)getRegParam( NTservice, "DebugLevel" );
i = (int*)getRegParam( regService, "DebugLevel" );
if ( i != NULL )
{
slap_debug = *i;
Debug( LDAP_DEBUG_ANY, "new debug level from registry is: %d\n", slap_debug, 0, 0 );
}
newUrls = (char *) getRegParam(NTservice, "Urls");
newUrls = (char *) getRegParam(regService, "Urls");
if (newUrls)
{
if (urls)
@ -196,7 +199,7 @@ int main( int argc, char **argv )
urls, 0, 0);
}
newConfigFile = (char*)getRegParam( NTservice, "ConfigFile" );
newConfigFile = (char*)getRegParam( regService, "ConfigFile" );
if ( newConfigFile != NULL )
{
configfile = newConfigFile;