[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  aa2e415 s3:winbindd_cm: close sockfd on error in cm_prepare_connection()
       via  b895f1f s3:libsmb: close fd on error in cli_connect_nb()
      from  f3c39cf librpc: install drsuapi and drsblobs headers.

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


- Log -----------------------------------------------------------------
commit aa2e415442fe121a3db5fa79e53ad732d78e9572
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 21 18:03:44 2011 +0100

    s3:winbindd_cm: close sockfd on error in cm_prepare_connection()
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Nov 21 19:58:58 CET 2011 on sn-devel-104

commit b895f1fb018405a5149c1c2a55e282bc88e6f8d3
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 21 18:03:07 2011 +0100

    s3:libsmb: close fd on error in cli_connect_nb()
    
    metze

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

Summary of changes:
 source3/libsmb/cliconnect.c    |    2 ++
 source3/winbindd/winbindd_cm.c |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c
index a2a65b5..c2fa923 100644
--- a/source3/libsmb/cliconnect.c
+++ b/source3/libsmb/cliconnect.c
@@ -3060,6 +3060,8 @@ NTSTATUS cli_connect_nb(const char *host, const struct sockaddr_storage *dest_ss
 
 	cli = cli_state_create(NULL, fd, desthost, NULL, signing_state, flags);
 	if (cli == NULL) {
+		close(fd);
+		fd = -1;
 		goto fail;
 	}
 
diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 7cfcaba..cfb1103 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -802,6 +802,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
 	mutex = grab_named_mutex(talloc_tos(), controller,
 				 WINBIND_SERVER_MUTEX_WAIT_TIME);
 	if (mutex == NULL) {
+		close(sockfd);
 		DEBUG(0,("cm_prepare_connection: mutex grab failed for %s\n",
 			 controller));
 		result = NT_STATUS_POSSIBLE_DEADLOCK;
@@ -814,6 +815,7 @@ static NTSTATUS cm_prepare_connection(const struct winbindd_domain *domain,
 				controller, domain->alt_name,
 				SMB_SIGNING_DEFAULT, flags);
 	if (*cli == NULL) {
+		close(sockfd);
 		DEBUG(1, ("Could not cli_initialize\n"));
 		result = NT_STATUS_NO_MEMORY;
 		goto done;


-- 
Samba Shared Repository