From 35f33a26404866c676285356a17e42b56523008a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Thu, 27 Mar 2008 11:26:33 +0100
Subject: libreplace: fix coverity ID 517 - untangle close from open in
 test/os2_delete.c

This is not a proper bug but the code is clearer now
and we are tracking failure of open separate from that of close.

Michael
(This used to be commit 4ae4692bc6c6da15483a6f4a3363cdc23121efc7)
---
 source4/lib/replace/test/os2_delete.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'source4')

diff --git a/source4/lib/replace/test/os2_delete.c b/source4/lib/replace/test/os2_delete.c
index c6ef180017..b45c135355 100644
--- a/source4/lib/replace/test/os2_delete.c
+++ b/source4/lib/replace/test/os2_delete.c
@@ -39,8 +39,15 @@ static void create_files(void)
 	int i;
 	for (i=0;i<NUM_FILES;i++) {
 		char fname[40];
+		int fd;
 		sprintf(fname, TESTDIR "/test%u.txt", i);
-		close(open(fname, O_CREAT|O_RDWR, 0600)) == 0 || FAILED("close");
+		fd = open(fname, O_CREAT|O_RDWR, 0600);
+		if (fd < 0) {
+			FAILED("open");
+		}
+		if (close(fd) != 0) {
+			FAILED("close");
+		}
 	}
 }
 
-- 
cgit 


From 677dc6aa897aed0919050545155fbd868c210b89 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Thu, 27 Mar 2008 17:49:56 +0100
Subject: provision: Initialize uninitialized variables if "targetdir" is not
 defined and there is no smb.conf file (This used to be commit
 19c29f473883be0a17fa740de9feb226f347df4a)

---
 source4/scripting/python/samba/provision.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4')

diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 47d00f8871..e97ce694b4 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -373,7 +373,10 @@ def load_or_make_smbconf(smbconf, setup_path, hostname, domain, realm, serverrol
             lockdir_line = "lock dir = " + os.path.abspath(targetdir)
 
             default_lp.set("lock dir", os.path.abspath(targetdir))
-            
+        else:
+	    privatedir_line = "private_dir = " + default_lp.get("private dir")
+	    lockdir_line = "lock dir = " + default_lp.get("lock dir")
+
         sysvol = os.path.join(default_lp.get("lock dir"), "sysvol")
         netlogon = os.path.join(sysvol, realm.lower(), "scripts")
 
-- 
cgit 


From e15b35e3897e63b9e815a04101436439d4aebdef Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 27 Mar 2008 22:26:37 +0100
Subject: Remove define that appears to cause configure test breakage on
 Julien's machine. (This used to be commit
 f47df5761571dd5c36789fb2e225a1125ca0e8f7)

---
 source4/scripting/python/config.m4 | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source4')

diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index aac98ebc60..3790071ba8 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/scripting/python/config.m4
@@ -23,9 +23,7 @@ AC_DEFUN([TRY_LINK_PYTHON],
 
 		AC_TRY_LINK([
 				/* we have our own configure tests */
-				#define Py_PYCONFIG_H 1
 				#include <Python.h>
-				#include <stdlib.h>
 			],[
 				Py_InitModule(NULL, NULL);
 			],[
-- 
cgit