svn commit: samba r13729 - branches/SAMBA_3_0/source/passdb trunk/source/passdb

[vlendec at samba.org]

Author: vlendec
Date: 2006-02-27 21:28:19 +0000 (Mon, 27 Feb 2006)
New Revision: 13729

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

Log:
Fix smbpasswd -x
Modified:
   branches/SAMBA_3_0/source/passdb/pdb_tdb.c
   trunk/source/passdb/pdb_tdb.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/pdb_tdb.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/pdb_tdb.c	2006-02-27 21:24:12 UTC (rev 13728)
+++ branches/SAMBA_3_0/source/passdb/pdb_tdb.c	2006-02-27 21:28:19 UTC (rev 13729)
@@ -1157,12 +1157,12 @@
 	uint32		rid;
 	fstring		name;
 	
-	/* make sure we have an open handle to the tdb.  Should have happened 
-	   at module  initialization time */
-	   
-	if ( !tdbsam ) {
-		DEBUG(0,("tdbsam_delete_sam_account: tdbsam not open!\n"));
-		return NT_STATUS_NO_SUCH_USER;
+	/* open the database */
+		
+	if ( !tdbsam_open( tdbsam_filename ) ) {
+		DEBUG(0,("tdbsam_delete_sam_account: failed to open %s!\n",
+			 tdbsam_filename));
+		return NT_STATUS_ACCESS_DENIED;
 	}
 
 	fstrcpy(name, pdb_get_username(sam_pass));
@@ -1176,13 +1176,6 @@
 	
 	rid = pdb_get_user_rid(sam_pass);
 
-	/* open the database */
-		
-	if ( !tdbsam_open( tdbsam_filename ) ) {
-		DEBUG(0,("tdbsam_delete_sam_account: failed to open %s!\n", tdbsam_filename));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-	
 	/* it's outaa here!  8^) */
 
 	if ( tdb_delete(tdbsam, key) != TDB_SUCCESS ) {

Modified: trunk/source/passdb/pdb_tdb.c
===================================================================
--- trunk/source/passdb/pdb_tdb.c	2006-02-27 21:24:12 UTC (rev 13728)
+++ trunk/source/passdb/pdb_tdb.c	2006-02-27 21:28:19 UTC (rev 13729)
@@ -1157,12 +1157,12 @@
 	uint32		rid;
 	fstring		name;
 	
-	/* make sure we have an open handle to the tdb.  Should have happened 
-	   at module  initialization time */
-	   
-	if ( !tdbsam ) {
-		DEBUG(0,("tdbsam_delete_sam_account: tdbsam not open!\n"));
-		return NT_STATUS_NO_SUCH_USER;
+	/* open the database */
+		
+	if ( !tdbsam_open( tdbsam_filename ) ) {
+		DEBUG(0,("tdbsam_delete_sam_account: failed to open %s!\n",
+			 tdbsam_filename));
+		return NT_STATUS_ACCESS_DENIED;
 	}
 
 	fstrcpy(name, pdb_get_username(sam_pass));
@@ -1176,13 +1176,6 @@
 	
 	rid = pdb_get_user_rid(sam_pass);
 
-	/* open the database */
-		
-	if ( !tdbsam_open( tdbsam_filename ) ) {
-		DEBUG(0,("tdbsam_delete_sam_account: failed to open %s!\n", tdbsam_filename));
-		return NT_STATUS_ACCESS_DENIED;
-	}
-	
 	/* it's outaa here!  8^) */
 
 	if ( tdb_delete(tdbsam, key) != TDB_SUCCESS ) {