]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/bconfig.c
fix arbitrary precision number display when no big number library is available
[openldap] / servers / slapd / bconfig.c
index 13091fcc675748790d1f1fdfa58fd5b3646945d5..624801ec882d84a92eb853f2af29b137626088a5 100644 (file)
@@ -1529,7 +1529,7 @@ config_overlay(ConfigArgs *c) {
                /* log error */
                Debug( SLAPD_DEBUG_CONFIG_ERROR, "%s: (optional) %s overlay \"%s\" configuration failed"
                        SLAPD_CONF_UNKNOWN_IGNORED ".\n",
-                       c->log, c->be == frontendDB ? "global " : "", c->argv[1][1]);
+                       c->log, c->be == frontendDB ? "global " : "", &c->argv[1][1]);
 #ifdef SLAPD_CONF_UNKNOWN_BAILOUT
                return 1;
 #endif /* SLAPD_CONF_UNKNOWN_BAILOUT */
@@ -1562,9 +1562,15 @@ config_suffix(ConfigArgs *c)
        }
 
        if ( notallowed != NULL ) {
+               char    buf[ SLAP_TEXT_BUFLEN ] = { '\0' };
+
+               if ( !BER_BVISNULL( &c->value_dn ) ) {
+                       snprintf( buf, sizeof( buf ), "<%s> ", c->value_dn.bv_val );
+               }
+
                Debug(LDAP_DEBUG_ANY,
-                       "%s: suffix <%s> not allowed in %s database.\n",
-                       c->log, c->value_dn.bv_val, notallowed );
+                       "%s: suffix %snot allowed in %s database.\n",
+                       c->log, buf, notallowed );
                return 1;
        }
 
@@ -3318,8 +3324,6 @@ config_modify_internal( CfEntryInfo *ce, Operation *op, SlapReply *rs,
                        int *idx = NULL;
                        if ( ct && ( ct->arg_type & ARG_NO_DELETE )) {
                                rc = LDAP_OTHER;
-                               snprintf( ca->msg, sizeof(ca->msg),
-                                       "<%s> cannot be deleted" );
                                snprintf(ca->msg, sizeof(ca->msg), "cannot delete %s",
                                        ml->sml_desc->ad_cname.bv_val );
                                goto out;