r3974: - Fix assignment of a couple of fields in pdb_{mysql,pgsql}

- Use new DTD URL in pdb_xml

diff --git a/source/passdb/pdb_mysql.c b/source/passdb/pdb_mysql.c
index deed27dbe498e931d38a02c875ce1176065672dd..0e6a11d9326d9b99273a9a7e8861101f526d0146 100644 (file)
--- a/source/passdb/pdb_mysql.c
+++ b/source/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/source/passdb/pdb_pgsql.c b/source/passdb/pdb_pgsql.c
index 1731c720a21b9c0a8678d16ec26168eacc9b2085..6578d3d192a97cc27a6ecd0086e587bb65c219b6 100644 (file)
--- a/source/passdb/pdb_pgsql.c
+++ b/source/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/source/passdb/pdb_xml.c b/source/passdb/pdb_xml.c
index 6eff57d365e350016de209fe17a8b6913968d18b..6eb7761a3b477094e7e1e801b37f40fd833adf59 100644 (file)
--- a/source/passdb/pdb_xml.c
+++ b/source/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"