diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-db.c b/src/lib-sieve/storage/ldap/sieve-ldap-db.c index bdfb9eb29f76dd7e7056017895528ac97fd181e9..1e783c36235cd7beab6db4bc45e94f4c71571936 100644 --- a/src/lib-sieve/storage/ldap/sieve-ldap-db.c +++ b/src/lib-sieve/storage/ldap/sieve-ldap-db.c @@ -706,9 +706,9 @@ static int db_ldap_set_options(struct ldap_connection *conn) "deref", set->deref) < 0) return -1; #ifdef LDAP_OPT_DEBUG_LEVEL - if (str_to_int(set->debug_level, &value) >= 0 && value != 0) { + if (set->debug_level != 0) { if (db_ldap_set_opt(conn, LDAP_OPT_DEBUG_LEVEL, &value, - "debug_level", set->debug_level) < 0) + "debug_level", dec2str(set->debug_level)) < 0) return -1; } #endif @@ -740,7 +740,6 @@ int sieve_ldap_db_connect(struct ldap_connection *conn) const struct sieve_ldap_settings *set = conn->lstorage->ldap_set; struct sieve_storage *storage = &conn->lstorage->storage; struct timeval start, end; - int debug_level; bool debug; #if defined(HAVE_LDAP_SASL) || defined(LDAP_HAVE_START_TLS_S) int ret; @@ -749,9 +748,7 @@ int sieve_ldap_db_connect(struct ldap_connection *conn) if (conn->conn_state != LDAP_CONN_STATE_DISCONNECTED) return 0; - debug = FALSE; - if (str_to_int(set->debug_level, &debug_level) >= 0) - debug = debug_level > 0; + debug = set->debug_level > 0; if (debug) i_gettimeofday(&start); diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c index a385b6a6f37e874f84dc6e792b6ee813ed55f30f..9245cae4e6918c8f6aa44d0293ea21ac6af55f1d 100644 --- a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c +++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.c @@ -44,7 +44,7 @@ static const struct setting_define sieve_ldap_setting_defines[] = { DEF(ENUM, scope), DEF(STR, base), DEF(UINT, ldap_version), - DEF(STR, debug_level), + DEF(UINT, debug_level), DEF(STR, ldaprc_path), SETTING_DEFINE_LIST_END @@ -70,7 +70,7 @@ const struct sieve_ldap_settings sieve_ldap_default_settings = { .scope = "subtree:onelevel:base", .base = "", .ldap_version = 3, - .debug_level = "0", + .debug_level = 0, .ldaprc_path = "", }; diff --git a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h index 22f90db74714918e4df8dd709f5cdeac0367661c..420a405569806c7f6c36d67c02ead2333201af38 100644 --- a/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h +++ b/src/lib-sieve/storage/ldap/sieve-ldap-storage-settings.h @@ -28,7 +28,7 @@ struct sieve_ldap_settings { unsigned int ldap_version; const char *ldaprc_path; - const char *debug_level; + unsigned int debug_level; /* ... */ struct {