diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-25 20:55:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:53:26 -0500 |
| commit | 2956b574df1126244c6b8400641e12dd145df06b (patch) | |
| tree | 7dd05bf1f083c2de461363e21f527b95f9c8d1f5 | |
| parent | c3a798cb7a11f95fc4a96b88eaa6b03581ccf409 (diff) | |
| download | samba-2956b574df1126244c6b8400641e12dd145df06b.tar.gz samba-2956b574df1126244c6b8400641e12dd145df06b.tar.bz2 samba-2956b574df1126244c6b8400641e12dd145df06b.zip | |
r3974: - Fix assignment of a couple of fields in pdb_{mysql,pgsql}
- Use new DTD URL in pdb_xml
(This used to be commit 99dc2f36d1f637906d47e98dbd4d5eb1f1cc4357)
| -rw-r--r-- | source3/passdb/pdb_mysql.c | 10 | ||||
| -rw-r--r-- | source3/passdb/pdb_pgsql.c | 5 | ||||
| -rw-r--r-- | source3/passdb/pdb_xml.c | 2 |
3 files changed, 9 insertions, 8 deletions
diff --git a/source3/passdb/pdb_mysql.c b/source3/passdb/pdb_mysql.c index deed27dbe4..0e6a11d932 100644 --- a/source3/passdb/pdb_mysql.c +++ b/source3/passdb/pdb_mysql.c @@ -111,11 +111,11 @@ static NTSTATUS row_to_sam_account(MYSQL_RES * r, SAM_ACCOUNT * u) pdb_set_plaintext_passwd(u, row[22]); pdb_set_acct_ctrl(u, xatol(row[23]), PDB_SET); - pdb_set_logon_divs(u, xatol(row[25]), PDB_SET); - pdb_set_hours_len(u, xatol(row[26]), PDB_SET); - pdb_set_bad_password_count(u, xatol(row[27]), PDB_SET); - pdb_set_logon_count(u, xatol(row[28]), PDB_SET); - pdb_set_unknown_6(u, xatol(row[29]), PDB_SET); + pdb_set_logon_divs(u, xatol(row[24]), PDB_SET); + pdb_set_hours_len(u, xatol(row[25]), PDB_SET); + pdb_set_bad_password_count(u, xatol(row[26]), PDB_SET); + pdb_set_logon_count(u, xatol(row[27]), PDB_SET); + pdb_set_unknown_6(u, xatol(row[28]), PDB_SET); return NT_STATUS_OK; } diff --git a/source3/passdb/pdb_pgsql.c b/source3/passdb/pdb_pgsql.c index 1731c720a2..6578d3d192 100644 --- a/source3/passdb/pdb_pgsql.c +++ b/source3/passdb/pdb_pgsql.c @@ -98,8 +98,9 @@ static NTSTATUS row_to_sam_account ( PGresult *r, long row, SAM_ACCOUNT *u ) pdb_set_munged_dial ( u, PQgetvalue( r, row, 17 ), PDB_SET ) ; pdb_set_acct_ctrl ( u, PQgetlong ( r, row, 23 ), PDB_SET ) ; - pdb_set_logon_divs ( u, PQgetlong ( r, row, 25 ), PDB_SET ) ; - pdb_set_hours_len ( u, PQgetlong ( r, row, 26 ), PDB_SET ) ; + pdb_set_logon_divs ( u, PQgetlong ( r, row, 24 ), PDB_SET ) ; + pdb_set_hours_len ( u, PQgetlong ( r, row, 25 ), PDB_SET ) ; + pdb_set_bad_password_count ( u, PQgetlong (r, row, 26 ), PDB_SET ) ; pdb_set_logon_count ( u, PQgetlong ( r, row, 27 ), PDB_SET ) ; pdb_set_unknown_6 ( u, PQgetlong ( r, row, 28 ), PDB_SET ) ; diff --git a/source3/passdb/pdb_xml.c b/source3/passdb/pdb_xml.c index 6eff57d365..6eb7761a3b 100644 --- a/source3/passdb/pdb_xml.c +++ b/source3/passdb/pdb_xml.c @@ -28,7 +28,7 @@ */ -#define XML_URL "http://samba.org/~jelmer/sambapdb.dtd" +#define XML_URL "http://samba.org/samba/DTD/passdb" #include "includes.h" |