svn commit: samba r14089 - in trunk/source/passdb: .

[jra at samba.org]

Author: jra
Date: 2006-03-09 19:03:39 +0000 (Thu, 09 Mar 2006)
New Revision: 14089

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

Log:
Fix Coverity bug #20. Don't deref possible null.
Jeremy.

Modified:
   trunk/source/passdb/secrets.c


Changeset:
Modified: trunk/source/passdb/secrets.c
===================================================================
--- trunk/source/passdb/secrets.c	2006-03-09 19:03:31 UTC (rev 14088)
+++ trunk/source/passdb/secrets.c	2006-03-09 19:03:39 UTC (rev 14089)
@@ -177,13 +177,16 @@
 	strupper_m(key);
 	dyn_guid = (struct uuid *)secrets_fetch(key, &size);
 
-	if ((!dyn_guid) && (lp_server_role() == ROLE_DOMAIN_PDC)) {
-		smb_uuid_generate_random(&new_guid);
-		if (!secrets_store_domain_guid(domain, &new_guid))
+	if (!dyn_guid) {
+		if (lp_server_role() == ROLE_DOMAIN_PDC) {
+			smb_uuid_generate_random(&new_guid);
+			if (!secrets_store_domain_guid(domain, &new_guid))
+				return False;
+			dyn_guid = (struct uuid *)secrets_fetch(key, &size);
+		}
+		if (dyn_guid == NULL) {
 			return False;
-		dyn_guid = (struct uuid *)secrets_fetch(key, &size);
-		if (dyn_guid == NULL)
-			return False;
+		}
 	}
 
 	if (size != sizeof(struct uuid)) {