]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
auth: Use sql_init_full
authorAki Tuomi <aki.tuomi@dovecot.fi>
Mon, 3 Sep 2018 10:59:41 +0000 (13:59 +0300)
committerVille Savolainen <ville.savolainen@dovecot.fi>
Wed, 14 Nov 2018 08:12:47 +0000 (10:12 +0200)
src/auth/db-sql.c

index 698f95e5b7184ead5a5057b0f2b4de4c892e76a8..79936aed75d790d505043f9e367db340e5547c6b 100644 (file)
@@ -63,6 +63,7 @@ static const char *parse_setting(const char *key, const char *value,
 struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
 {
        struct db_sql_connection *conn;
+       struct sql_settings set;
        const char *error;
        pool_t pool;
 
@@ -106,7 +107,12 @@ struct db_sql_connection *db_sql_init(const char *config_path, bool userdb)
                i_fatal("sql: connect string not set in configuration file %s",
                        config_path);
        }
-       conn->db = sql_init(conn->set.driver, conn->set.connect);
+       i_zero(&set);
+       set.driver = conn->set.driver;
+       set.connect_string = conn->set.connect;
+       if (sql_init_full(&set, &conn->db, &error) < 0) {
+               i_fatal("sql: %s", error);
+       }
 
        conn->next = connections;
        connections = conn;