summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Bokovoy <ab@samba.org>2003-09-19 13:09:10 +0000
committerAlexander Bokovoy <ab@samba.org>2003-09-19 13:09:10 +0000
commit593e93b16b7c7daba9fbb989f9d4a1a027de8e2f (patch)
treeee5f2e3f38707dbfa4ae733a7833d1da858f159c
parent84aea8346ef0b4b44fb94fb4640687ca525107a7 (diff)
downloadsamba-593e93b16b7c7daba9fbb989f9d4a1a027de8e2f.tar.gz
samba-593e93b16b7c7daba9fbb989f9d4a1a027de8e2f.tar.bz2
samba-593e93b16b7c7daba9fbb989f9d4a1a027de8e2f.zip
Fix pdb_mysql. Jelmer will look into details tonight.
(This used to be commit b00a81b543a58f46e54ce0e5362ba21bb16fc35f)
-rw-r--r--source3/passdb/pdb_mysql.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/passdb/pdb_mysql.c b/source3/passdb/pdb_mysql.c
index 460e260ddc..9004c97716 100644
--- a/source3/passdb/pdb_mysql.c
+++ b/source3/passdb/pdb_mysql.c
@@ -446,7 +446,7 @@ static NTSTATUS mysqlsam_select_by_field(struct pdb_methods * methods, SAM_ACCOU
}
asprintf(&query,
- "SELECT %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s FROM %s WHERE %s = '%s'",
+ "SELECT %s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s FROM %s WHERE %s = '%s'",
config_value_read(data, "logon time column",
CONFIG_LOGON_TIME_DEFAULT),
config_value_read(data, "logoff time column",
@@ -501,8 +501,10 @@ static NTSTATUS mysqlsam_select_by_field(struct pdb_methods * methods, SAM_ACCOU
CONFIG_LOGON_DIVS_DEFAULT),
config_value_read(data, "hours len column",
CONFIG_HOURS_LEN_DEFAULT),
- config_value_read(data, "unknown 5 column",
- CONFIG_UNKNOWN_5_DEFAULT),
+ config_value_read(data, "bad password count column",
+ CONFIG_BAD_PASSWORD_COUNT_DEFAULT),
+ config_value_read(data, "logon count column",
+ CONFIG_LOGON_COUNT_DEFAULT),
config_value_read(data, "unknown 6 column",
CONFIG_UNKNOWN_6_DEFAULT),
config_value(data, "table", CONFIG_TABLE_DEFAULT), field,