This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.

[kai/samba.git] / source / passdb / pdb_mysql.c

diff --git a/source/passdb/pdb_mysql.c b/source/passdb/pdb_mysql.c
index 48441ffeaef528b94ee9aad4112d4ae8fbe7c37c..d0f30c639460bf4055e10364495d39d4ff29139a 100644 (file)
--- a/source/passdb/pdb_mysql.c
+++ b/source/passdb/pdb_mysql.c
@@ -1,4 +1,3 @@
-
 /*
  * MySQL password backend for samba
  * Copyright (C) Jelmer Vernooij 2002
@@ -351,13 +350,14 @@ static NTSTATUS mysqlsam_setsampwent(struct pdb_methods *methods, BOOL update)
                                                           CONFIG_UNKNOWN_6_DEFAULT),
                         config_value(data, "table", CONFIG_TABLE_DEFAULT)
                                 );
+       DEBUG(5, ("Executing query %s\n", query));
        
        ret = mysql_query(data->handle, query);
        SAFE_FREE(query);
 
        if (ret) {
                DEBUG(0,
-                          ("Error executing query: %s\n", mysql_error(data->handle)));
+                          ("Error executing MySQL query %s\n", mysql_error(data->handle)));
                return NT_STATUS_UNSUCCESSFUL;
        }
 
@@ -370,8 +370,8 @@ static NTSTATUS mysqlsam_setsampwent(struct pdb_methods *methods, BOOL update)
        }
        
        DEBUG(5,
-               ("mysqlsam_setsampwent succeeded(%d results)!\n",
-                               mysql_num_fields(data->pwent)));
+               ("mysqlsam_setsampwent succeeded(%lu results)!\n",
+                               mysql_num_rows(data->pwent)));
        
        return NT_STATUS_OK;
 }
@@ -518,6 +518,8 @@ static NTSTATUS mysqlsam_select_by_field(struct pdb_methods * methods, SAM_ACCOU
                         esc_sname);
        
        SAFE_FREE(esc_sname);
+
+       DEBUG(5, ("Executing query %s\n", query));
        
        mysql_ret = mysql_query(data->handle, query);
        
@@ -525,7 +527,7 @@ static NTSTATUS mysqlsam_select_by_field(struct pdb_methods * methods, SAM_ACCOU
        
        if (mysql_ret) {
                DEBUG(0,
-                       ("Error while executing MySQL query: %s\n",
+                       ("Error while executing MySQL query %s\n", 
                                mysql_error(data->handle)));
                return NT_STATUS_UNSUCCESSFUL;
        }
@@ -675,7 +677,7 @@ static NTSTATUS mysqlsam_replace_sam_account(struct pdb_methods *methods,
        /* I know this is somewhat overkill but only the talloc 
         * functions have asprint_append and the 'normal' asprintf 
         * is a GNU extension */
-       query.mem_ctx = talloc_init();
+       query.mem_ctx = talloc_init("mysqlsam_replace_sam_account");
        query.part2 = talloc_asprintf(query.mem_ctx, "%s", "");
        if (query.update) {
                query.part1 =
@@ -737,7 +739,7 @@ static NTSTATUS mysqlsam_replace_sam_account(struct pdb_methods *methods,
        if (pdb_get_pass_last_set_time(newpwd)) {
                pdb_mysql_int_field(methods, &query,
                                                        config_value_write(data,
-                                                                                          "pass must change time column",
+                                                                                          "pass last set time column",
                                                                                           CONFIG_PASS_LAST_SET_TIME_DEFAULT),
                                                        pdb_get_pass_last_set_time(newpwd));
        }