auth: ldap_settings - Change debug_level config to UINT

diff --git a/src/auth/db-ldap-settings.c b/src/auth/db-ldap-settings.c
index 0ab93f75f1eab9f4407105c2403f8d78879d050e..1007502940aa2459ae8b376c4c7b8aa76b5ada72 100644 (file)
--- a/src/auth/db-ldap-settings.c
+++ b/src/auth/db-ldap-settings.c
@@ -30,7 +30,7 @@ static const struct setting_define ldap_setting_defines[] = {
        DEF(ENUM, deref),
        DEF(ENUM, scope),
        DEF(UINT, version),
-       DEF(STR, debug_level),
+       DEF(UINT, debug_level),
        SETTING_DEFINE_LIST_END
 };
 
@@ -46,7 +46,7 @@ static const struct ldap_settings ldap_default_settings = {
        .deref = "never:searching:finding:always",
        .scope = "subtree:onelevel:base",
        .version = 3,
-       .debug_level = "0",
+       .debug_level = 0,
 };
 
 static const struct setting_keyvalue ldap_default_settings_keyvalue[] = {

diff --git a/src/auth/db-ldap-settings.h b/src/auth/db-ldap-settings.h
index 00b441e07908980281e29708f639b88aec2b91fd..6d95ff4902a27ecb4807a50cbae1670485109105 100644 (file)
--- a/src/auth/db-ldap-settings.h
+++ b/src/auth/db-ldap-settings.h
@@ -27,8 +27,7 @@ struct ldap_settings {
        const char *deref;
        const char *scope;
 
-       const char *debug_level;
-
+       unsigned int debug_level;
        unsigned int version;
 
        uid_t uid;

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 6c74243fe7296169c4b1d52438b0b04d4d93b2ca..59aaa0c64737bf7df820e67b2ae9410da3ac06aa 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -949,10 +949,9 @@ static void db_ldap_set_options(struct ldap_connection *conn)
        db_ldap_set_opt(conn, conn->ld, LDAP_OPT_DEREF, &conn->set->parsed_deref,
                        "ldap_deref", conn->set->deref);
 #ifdef LDAP_OPT_DEBUG_LEVEL
-       int debug_level;
-       if (str_to_int(conn->set->debug_level, &debug_level) >= 0 && debug_level != 0) {
-               db_ldap_set_opt(conn, NULL, LDAP_OPT_DEBUG_LEVEL, &debug_level,
-                               "ldap_debug_level", conn->set->debug_level);
+       if (conn->set->debug_level != 0) {
+               db_ldap_set_opt(conn, NULL, LDAP_OPT_DEBUG_LEVEL, &conn->set->debug_level,
+                               "ldap_debug_level", dec2str(conn->set->debug_level));
                event_set_forced_debug(conn->event, TRUE);
        }
 #endif