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

[vlendec at samba.org]

Author: vlendec
Date: 2006-06-13 18:01:58 +0000 (Tue, 13 Jun 2006)
New Revision: 16197

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

Log:
Fix Klocwork id 1338
Modified:
   branches/SAMBA_3_0/source/passdb/secrets.c
   trunk/source/passdb/secrets.c


Changeset:
Modified: branches/SAMBA_3_0/source/passdb/secrets.c
===================================================================
--- branches/SAMBA_3_0/source/passdb/secrets.c	2006-06-13 17:55:39 UTC (rev 16196)
+++ branches/SAMBA_3_0/source/passdb/secrets.c	2006-06-13 18:01:58 UTC (rev 16197)
@@ -1044,8 +1044,6 @@
 		return False;
 	}
 
-	tdb_close(tdb_sc);
-
 	pdc = TALLOC_ZERO_P(mem_ctx, struct dcinfo);
 
 	/* Retrieve the record. */
@@ -1063,6 +1061,7 @@
 	if (ret == -1 || l1 != 8 || l2 != 8 || l3 != 8 || l4 != 16 || l5 != 16) {
 		/* Bad record - delete it. */
 		tdb_delete_bystring(tdb_sc, keystr);
+		tdb_close(tdb_sc);
 		TALLOC_FREE(keystr);
 		TALLOC_FREE(pdc);
 		SAFE_FREE(pseed_chal);
@@ -1074,6 +1073,8 @@
 		return False;
 	}
 
+	tdb_close(tdb_sc);
+
 	memcpy(pdc->seed_chal.data, pseed_chal, 8);
 	memcpy(pdc->clnt_chal.data, pclnt_chal, 8);
 	memcpy(pdc->srv_chal.data, psrv_chal, 8);

Modified: trunk/source/passdb/secrets.c
===================================================================
--- trunk/source/passdb/secrets.c	2006-06-13 17:55:39 UTC (rev 16196)
+++ trunk/source/passdb/secrets.c	2006-06-13 18:01:58 UTC (rev 16197)
@@ -1174,8 +1174,6 @@
 		return False;
 	}
 
-	tdb_close(tdb_sc);
-
 	pdc = TALLOC_ZERO_P(mem_ctx, struct dcinfo);
 
 	/* Retrieve the record. */
@@ -1193,6 +1191,7 @@
 	if (ret == -1 || l1 != 8 || l2 != 8 || l3 != 8 || l4 != 16 || l5 != 16) {
 		/* Bad record - delete it. */
 		tdb_delete_bystring(tdb_sc, keystr);
+		tdb_close(tdb_sc);
 		TALLOC_FREE(keystr);
 		TALLOC_FREE(pdc);
 		SAFE_FREE(pseed_chal);
@@ -1204,6 +1203,8 @@
 		return False;
 	}
 
+	tdb_close(tdb_sc);
+
 	memcpy(pdc->seed_chal.data, pseed_chal, 8);
 	memcpy(pdc->clnt_chal.data, pclnt_chal, 8);
 	memcpy(pdc->srv_chal.data, psrv_chal, 8);