]> git.ipfire.org Git - thirdparty/freeradius-server.git/commitdiff
Pass correct struct to field counting functions
authorArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 11 Dec 2015 16:32:41 +0000 (11:32 -0500)
committerArran Cudbard-Bell <a.cudbardb@freeradius.org>
Fri, 11 Dec 2015 16:33:03 +0000 (11:33 -0500)
src/modules/rlm_sql/drivers/rlm_sql_mysql/rlm_sql_mysql.c

index d37482f815183b4ccdc74d0f3c3aa07732067ce5..91d161fc3d5d35d7df863d2dcffbd7b770096ae0 100644 (file)
@@ -389,9 +389,15 @@ static int sql_num_fields(rlm_sql_handle_t *handle, UNUSED rlm_sql_config_t *con
        rlm_sql_mysql_conn_t *conn = handle->conn;
 
 #if MYSQL_VERSION_ID >= 32224
+       /*
+        *      Count takes a connection handle
+        */
        if (!(num = mysql_field_count(conn->sock))) {
 #else
-       if (!(num = mysql_num_fields(conn->sock))) {
+       /*
+        *      Fields takes a result struct
+        */
+       if (!(num = mysql_num_fields(conn->result))) {
 #endif
                return -1;
        }