Misc. cleanup

diff --git a/servers/slapd/acl.c b/servers/slapd/acl.c
index 99b42832666cfed348a92eb0fac644ac35c7320b..027ad39fed4cb1d92b26dddbe3634d2ac552be65 100644 (file)
--- a/servers/slapd/acl.c
+++ b/servers/slapd/acl.c
@@ -620,12 +620,11 @@ aci_list_has_right (struct berval *list, int access, int action)
                        right = 0;
                        break;
                }
+
 #ifdef SLAPD_ACI_DISCRETE_RIGHTS
                if (right & access) {
                        return(action);
                }
-       }
-       return(!action);
 #else
                if (action != 0) {
                        /* check granted */
@@ -636,7 +635,12 @@ aci_list_has_right (struct berval *list, int access, int action)
                        if (right <= access)
                                return(1);
                }
+#endif
        }
+
+#ifdef SLAPD_ACI_DISCRETE_RIGHTS
+       return(!action);
+#else
        return(0);
 #endif
 }

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index f6e2cf9fc7bf40711b9b8b266999415e889dbb21..7b8da07c89f525000b634098a50d5602f0f1d6cb 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -61,7 +61,7 @@ ldap_pvt_thread_mutex_t       num_sent_mutex;
 ldap_pvt_thread_mutex_t        entry2str_mutex;
 ldap_pvt_thread_mutex_t        replog_mutex;
 
-static char* slap_name;
+static char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
 static ldap_pvt_thread_mutex_t currenttime_mutex;

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 919830f6dee18fb7a3b2270d58adfd5254a068ee..d30e6e3869df738a40c1e2251bd718c1cc182107 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -13,7 +13,6 @@
 #include "portable.h"
 
 #include <stdio.h>
-
 #include <ac/string.h>
 
 #include "slap.h"