Close connection to late

Author: baimard

util.c

@@ -236,6 +236,17 @@ check_user_token_mysql(const char *mysql_server,
     return retval;
   }
 
+  /* we need to close the connection before the return */
+  if(mysql_stmt_close(stmt))
+  {
+    if(verbose)
+    D (debug_file, "mysql_stmt_close() failed %s", mysql_stmt_error(stmt));
+    return retval;
+  }
+
+  mysql_close(con);
+  mysql_library_end();
+
   while(!mysql_stmt_fetch(stmt))
   {
     if(bind[0].is_null_value)
@@ -247,37 +258,27 @@ check_user_token_mysql(const char *mysql_server,
       if(otp_id != NULL){
         if(int_data)
         {
-          return AUTH_FOUND;
+          return AUTH_FOUND; /* User and token verified */
         }
         else
         {
-          return AUTH_NOT_FOUND;
+          return AUTH_NOT_FOUND; /* User ok but bad token */
         }
       }
       else if(otp_id == NULL)
       {
         if(int_data)
         {
-          return AUTH_NOT_FOUND;
+          return AUTH_NOT_FOUND; /* We found at least one line for the user */
         }
         else
         {
-          return AUTH_NO_TOKENS;
+          return AUTH_NO_TOKENS; /* We not found at least any line for the user */
         }
       }
     }
   }
 
-  if(mysql_stmt_close(stmt))
-  {
-    if(verbose)
-    D (debug_file, "mysql_stmt_close() failed %s", mysql_stmt_error(stmt));
-    return retval;
-  }
-
-  mysql_close(con);
-  mysql_library_end();
-
   return retval;
 }
 #endif