From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Tue, 2 Jun 2009 23:46:20 +0000 (+0000)
Subject: Avoid printf(NULL) on Solaris
X-Git-Tag: OPENLDAP_REL_ENG_2_4_17~86
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc1384ab8048a3c687423538b4e75178b46b3eff;p=openldap

Avoid printf(NULL) on Solaris
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 569046000d..cdd277fe9c 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -320,7 +320,7 @@ static ConfigTable config_back_cf_table[] = {
 		&config_generic, "( OLcfgGlAt:7 NAME 'olcAuthzPolicy' "
 			"EQUALITY caseIgnoreMatch "
 			"SYNTAX OMsDirectoryString SINGLE-VALUE )", NULL, NULL },
-	{ "authz-regexp", NULL, 3, 3, 0, ARG_MAGIC|CFG_AZREGEXP|ARG_NO_INSERT,
+	{ "authz-regexp", "regexp> <DN", 3, 3, 0, ARG_MAGIC|CFG_AZREGEXP|ARG_NO_INSERT,
 		&config_generic, "( OLcfgGlAt:8 NAME 'olcAuthzRegexp' "
 			"EQUALITY caseIgnoreMatch "
 			"SYNTAX OMsDirectoryString X-ORDERED 'VALUES' )", NULL, NULL },
diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index f03a11be8e..1e18315f8c 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -143,7 +143,7 @@ int config_check_vals(ConfigTable *Conf, ConfigArgs *c, int check_only ) {
 	}
 	if(Conf->min_args && (c->argc < Conf->min_args)) {
 		snprintf( c->cr_msg, sizeof( c->cr_msg ), "<%s> missing <%s> argument",
-			c->argv[0], Conf->what );
+			c->argv[0], Conf->what ? Conf->what : "" );
 		Debug(LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE, "%s: keyword %s\n", c->log, c->cr_msg, 0 );
 		return(ARG_BAD_CONF);
 	}