Avoid printf(NULL) on Solaris

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 569046000d1796c7edb71b3c1d9e6b2cb7f8cd94..cdd277fe9cb90ea7aa9900e06f21a6908fee9a7c 100644 (file)
--- 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 f03a11be8e388bb6ea1f13848a46cae4f369e8f7..1e18315f8c62a3dbb3181f65d487d8de2cfbd472 100644 (file)
--- 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);
        }