From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 25 Nov 2004 20:55:31 +0000 (+0000)
Subject: r3974: - Fix assignment of a couple of fields in pdb_{mysql,pgsql}
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5536
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=99dc2f36d1f637906d47e98dbd4d5eb1f1cc4357;p=thirdparty%2Fsamba.git

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 deed27dbe49..0e6a11d9326 100644
--- 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 1731c720a21..6578d3d192a 100644
--- 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 6eff57d365e..6eb7761a3b4 100644
--- 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"