[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1411-g4b3e89c

[Volker Lendecke]

The branch, master has been updated
       via  4b3e89c2e7f5e36edd436fccefb852a616ef2110 (commit)
       via  60d77096cb5d4ebfb756963deb0c25b1f046a61a (commit)
      from  79f33674c660f2ebbf75843b06049f036eceeeca (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 4b3e89c2e7f5e36edd436fccefb852a616ef2110
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 2 13:12:57 2009 +0200

    Fix Coverity 911: FORWARD_NULL. Metze, please check!

commit 60d77096cb5d4ebfb756963deb0c25b1f046a61a
Author: Volker Lendecke <vl at samba.org>
Date:   Sat May 2 12:53:30 2009 +0200

    Attempt to fix the merged build on OpenSuSE 10.2
    
    Python.h 2.5 on that platform does not #include the necessary headers
    to see uintptr_t.

-----------------------------------------------------------------------

Summary of changes:
 m4/check_python.m4            |    1 +
 source4/smbd/service_stream.c |    3 ++-
 2 files changed, 3 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/m4/check_python.m4 b/m4/check_python.m4
index 9453766..42eef19 100644
--- a/m4/check_python.m4
+++ b/m4/check_python.m4
@@ -17,6 +17,7 @@ AC_DEFUN([TRY_LINK_PYTHON],
 		CFLAGS="$CFLAGS $2"
 
 		AC_TRY_LINK([
+                                #undef HAVE_UINTPTR_T
 				/* we have our own configure tests */
 				#include <Python.h>
 			],[
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index e09ac1d..4d36d78 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -328,7 +328,8 @@ NTSTATUS stream_setup_socket(struct tevent_context *event_context,
 
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to listen on %s:%u - %s\n",
-			sock_addr, *port, nt_errstr(status)));
+			 sock_addr, port ? (unsigned int)(*port) : 0,
+			 nt_errstr(status)));
 		talloc_free(stream_socket);
 		return status;
 	}


-- 
Samba Shared Repository