From 9d2363a3986a331c77b6fb46243e9e818bb2f8e0 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Sat, 7 Oct 2006 21:45:08 +0000 Subject: [PATCH] ITS#4586 from HEAD --- servers/slapd/overlays/accesslog.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c index 9ac1610002..d47ae1d47a 100644 --- a/servers/slapd/overlays/accesslog.c +++ b/servers/slapd/overlays/accesslog.c @@ -597,6 +597,14 @@ log_cf_gen(ConfigArgs *c) case SLAP_CONFIG_EMIT: switch( c->type ) { case LOG_DB: + if ( li->li_db == NULL ) { + snprintf( c->msg, sizeof( c->msg ), + "accesslog: \"logdb \" must be specified" ); + Debug( LDAP_DEBUG_ANY, "%s: %s \"%s\"\n", + c->log, c->msg, c->value_dn.bv_val ); + rc = 1; + break; + } value_add( &c->rvalue_vals, li->li_db->be_suffix ); value_add( &c->rvalue_nvals, li->li_db->be_nsuffix ); break; @@ -674,7 +682,8 @@ log_cf_gen(ConfigArgs *c) case LOG_DB: li->li_db = select_backend( &c->value_ndn, 0, 0 ); if ( !li->li_db ) { - sprintf( c->msg, "<%s> no matching backend found for suffix", + snprintf( c->msg, sizeof( c->msg ), + "<%s> no matching backend found for suffix", c->argv[0] ); Debug( LDAP_DEBUG_ANY, "%s: %s \"%s\"\n", c->log, c->msg, c->value_dn.bv_val ); @@ -1341,6 +1350,13 @@ accesslog_db_open( int rc; void *thrctx; + if ( li->li_db == NULL ) { + Debug( LDAP_DEBUG_ANY, + "accesslog: \"logdb \" must be specified.\n", + 0, 0, 0 ); + return 1; + } + if ( slapMode & SLAP_TOOL_MODE ) return 0; -- 2.39.5