misc cleanup

diff --git a/servers/slapd/back-ldbm/extended.c b/servers/slapd/back-ldbm/extended.c
index 5e4762e49d1193bffd7b98582e4c2c08217d8d10..e5971db87bcd3434785a1b7de3dc4e3547133b26 100644 (file)
--- a/servers/slapd/back-ldbm/extended.c
+++ b/servers/slapd/back-ldbm/extended.c
@@ -50,7 +50,7 @@ ldbm_back_extended(
                }
        }
 
-       *text = ch_strdup("not supported within naming context");
+       *text = "not supported within naming context";
        return LDAP_OPERATIONS_ERROR;
 }
 

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index 441e1eb38df8340ed444755bb072d5c9549e9a13..2900d1b13409e1214ff7c4c49b49057973e6306b 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -191,8 +191,8 @@ int backend_startup(Backend *be)
        if(be != NULL) {
                /* startup a specific backend database */
                Debug( LDAP_DEBUG_TRACE,
-                       "backend_startup: starting database\n",
-                       0, 0, 0 );
+                       "backend_startup: starting \"%s\"\n",
+                       be->be_suffix[0], 0, 0 );
 
                if ( be->bd_info->bi_open ) {
                        rc = be->bd_info->bi_open( be->bd_info );

diff --git a/servers/slapd/dn.c b/servers/slapd/dn.c
index a20d5a2cb5c845aff9bf52cb8487299ccc42ed61..41ecb7bb003b6dab53ed401994691c1479649db5 100644 (file)
--- a/servers/slapd/dn.c
+++ b/servers/slapd/dn.c
@@ -218,11 +218,11 @@ dn_parent(
        }
 
        if( *dn == '\0' ) {
-               return( NULL );
+               return NULL;
        }
 
        if ( be != NULL && be_issuffix( be, dn ) ) {
-               return( NULL );
+               return NULL;
        }
 
        /*
@@ -246,12 +246,12 @@ dn_parent(
                        if ( *s == '"' ) {
                                inquote = 1;
                        } else if ( DN_SEPARATOR( *s ) ) {
-                               return( ch_strdup( &s[1] ) );
+                               return ch_strdup( &s[1] );
                        }
                }
        }
 
-       return( ch_strdup( "" ) );
+       return ch_strdup( "" );
 }
 
 char * dn_rdn( 

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index cb1e733c17910ae5d7c67db845c135766e44171c..4054963328daa4c80dc037a2cbcb434a92d4d69d 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -905,7 +905,7 @@ struct slap_conn;
 struct slap_op;
 
 typedef int (*SLAP_EXTENDED_FN) LDAP_P((
-    Backend            *be,
+    BackendDB          *be,
     struct slap_conn           *conn,
     struct slap_op             *op,
        const char              *reqoid,