Cleanup and SIGTRAP

diff --git a/servers/slapd/back-bdb/cache.c b/servers/slapd/back-bdb/cache.c
index d306add2a5003f326f0a2ad43543455477a0148b..3bcb11a1ed16ae0be4afcbea923cc9d894acbd59 100644 (file)
--- a/servers/slapd/back-bdb/cache.c
+++ b/servers/slapd/back-bdb/cache.c
@@ -565,7 +565,8 @@ bdb_cache_find_info(
        struct bdb_info *bdb,
        ID id )
 {
-       EntryInfo ei, *ei2;
+       EntryInfo ei = { 0 };
+       EntryInfo *ei2;
 
        ei.bei_id = id;
 
@@ -595,7 +596,7 @@ bdb_cache_find_id(
        struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        Entry   *ep = NULL;
        int     rc = 0;
-       EntryInfo ei;
+       EntryInfo ei = { 0 };
 
        ei.bei_id = id;
 

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 2e7230c8fc298d2e608b897a39a62d4109294219..1254f0af7e3b9e0fe791d14c1fc42026f370f295 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -639,6 +639,9 @@ int main( int argc, char **argv )
 #endif
        (void) SIGNAL( SIGINT, slap_sig_shutdown );
        (void) SIGNAL( SIGTERM, slap_sig_shutdown );
+#ifdef SIGTRAP
+       (void) SIGNAL( SIGTRAP, slap_sig_shutdown );
+#endif
 #ifdef LDAP_SIGCHLD
        (void) SIGNAL( LDAP_SIGCHLD, wait4child );
 #endif