svn commit: samba r3974 - in branches/SAMBA_3_0/source/passdb: .

[jelmer at samba.org]

Author: jelmer
Date: 2004-11-25 20:55:31 +0000 (Thu, 25 Nov 2004)
New Revision: 3974

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3974

Log:
- Fix assignment of a couple of fields in pdb_{mysql,pgsql}
- Use new DTD URL in pdb_xml

Modified:
   branches/SAMBA_3_0/source/passdb/pdb_mysql.c
   branches/SAMBA_3_0/source/passdb/pdb_pgsql.c
   branches/SAMBA_3_0/source/passdb/pdb_xml.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_mysql.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_mysql.c	2004-11-25 20:54:43 UTC (rev 3973)
+++ branches/SAMBA_3_0/source/passdb/pdb_mysql.c	2004-11-25 20:55:31 UTC (rev 3974)
@@ -111,11 +111,11 @@
 		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;
 }

Modified: branches/SAMBA_3_0/source/passdb/pdb_pgsql.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_pgsql.c	2004-11-25 20:54:43 UTC (rev 3973)
+++ branches/SAMBA_3_0/source/passdb/pdb_pgsql.c	2004-11-25 20:55:31 UTC (rev 3974)
@@ -98,8 +98,9 @@
   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 ) ;
   

Modified: branches/SAMBA_3_0/source/passdb/pdb_xml.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_xml.c	2004-11-25 20:54:43 UTC (rev 3973)
+++ branches/SAMBA_3_0/source/passdb/pdb_xml.c	2004-11-25 20:55:31 UTC (rev 3974)
@@ -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"