From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 22 Aug 2012 10:35:29 +0000 (+0200)
Subject: s3:g_lock: use serverid_exists() with SERVERID_UNIQUE_ID_NOT_TO_VERIFY
X-Git-Tag: samba-4.0.0beta7~47
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=774c28416bd05c66f398dfbc999cff0e209b3620;p=thirdparty%2Fsamba.git

s3:g_lock: use serverid_exists() with SERVERID_UNIQUE_ID_NOT_TO_VERIFY

metze
---

diff --git a/source3/lib/g_lock.c b/source3/lib/g_lock.c
index 4535b355690..fbd90225f09 100644
--- a/source3/lib/g_lock.c
+++ b/source3/lib/g_lock.c
@@ -29,6 +29,7 @@
 #include "../lib/util/tevent_ntstatus.h"
 #include "system/select.h"
 #include "messages.h"
+#include "serverid.h"
 
 struct g_lock_ctx {
 	struct db_context *db;
@@ -124,8 +125,16 @@ static NTSTATUS g_lock_trylock(struct db_record *rec, struct server_id self,
 			goto done;
 		}
 		if (g_lock_conflicts(type, locks[i].lock_type)) {
+			struct server_id pid = locks[i].pid;
 
-			if (process_exists(locks[i].pid)) {
+			/*
+			 * As the serverid_exists might recurse into
+			 * the g_lock code, we use
+			 * SERVERID_UNIQUE_ID_NOT_TO_VERIFY to avoid the loop
+			 */
+			pid.unique_id = SERVERID_UNIQUE_ID_NOT_TO_VERIFY;
+
+			if (serverid_exists(&pid)) {
 				status = NT_STATUS_LOCK_NOT_GRANTED;
 				goto done;
 			}