upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-17 12:24:19 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move SLAPD_MONITOR_DN out of format strings.

Browse source 
Otherwise slapd would break if SLAPD_MONITOR_DN contained a '%'.
This commit is contained in:
Hallvard Furuseth 2003-05-20 18:16:45 +00:00
parent 3db60ba479
commit 05d7b891ec
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
servers/slapd/back-monitor/init.c
View file

@ -261,12 +261,12 @@ monitor_back_db_init(
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG( OPERATION, CRIT,
"unable to normalize monitor DN \"" SLAPD_MONITOR_DN
"\"\n" , 0, 0, 0 );
"unable to normalize monitor DN \"%s\"\n",
SLAPD_MONITOR_DN, 0, 0 );
#else
Debug( LDAP_DEBUG_ANY,
"unable to normalize monitor DN \"" SLAPD_MONITOR_DN
"\"\n", 0, 0, 0 );
"unable to normalize monitor DN \"%s\"\n",
SLAPD_MONITOR_DN, 0, 0 );
#endif
return -1;
}
@ -768,7 +768,7 @@ monitor_back_db_open(
* creates the "cn=Monitor" entry
*/
snprintf( buf, sizeof( buf ),
"dn: " SLAPD_MONITOR_DN "\n"
"dn: %s\n"
"objectClass: %s\n"
"structuralObjectClass: %s\n"
"cn: Monitor\n"
@ -780,6 +780,7 @@ monitor_back_db_open(
#endif
"createTimestamp: %s\n"
"modifyTimestamp: %s\n",
SLAPD_MONITOR_DN,
mi->mi_oc_monitorServer->soc_cname.bv_val,
mi->mi_oc_monitorServer->soc_cname.bv_val,
mi->mi_ad_description->ad_cname.bv_val,

8
servers/slapd/config.c
View file

@ -968,12 +968,12 @@ read_config( const char *fname, int depth )
} else if ( strcasecmp( cargv[1], SLAPD_MONITOR_DN ) == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG( CONFIG, CRIT, "%s: line %d: \""
SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n",
fname, lineno, 0 );
"%s\" is reserved for monitoring slapd\n",
fname, lineno, SLAPD_MONITOR_DN );
#else
Debug( LDAP_DEBUG_ANY, "%s: line %d: \""
SLAPD_MONITOR_DN "\" is reserved for monitoring slapd\n",
fname, lineno, 0 );
"%s\" is reserved for monitoring slapd\n",
fname, lineno, SLAPD_MONITOR_DN );
#endif
return( 1 );
#endif /* SLAPD_MONITOR_DN */