[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  058d4a2... s3: Fix indentation in remove_ccache
       via  0264c0c... s3: Fix a memleak in discover_dc_netbios
       via  36e57fa... s3: Fix a typo in winbindd_ccache_save
       via  a97f2a0... nsswitch: Fix a memleak in wbinfo
      from  e1ca451... s3: Improved support for GAMIN.

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


- Log -----------------------------------------------------------------
commit 058d4a21afa843241c6a91a251fb46a327037194
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 17 21:39:09 2010 +0200

    s3: Fix indentation in remove_ccache

commit 0264c0c337058c03f9b4aca915f6af5e6a7731b0
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 17 20:09:45 2010 +0200

    s3: Fix a memleak in discover_dc_netbios

commit 36e57fa728fc98102d3f40d4341d22e6beb3802a
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Apr 17 19:24:34 2010 +0200

    s3: Fix a typo in winbindd_ccache_save

commit a97f2a0a9c0f1c148a0152202296bb078103b40c
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Apr 18 14:09:22 2010 +0200

    nsswitch: Fix a memleak in wbinfo

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

Summary of changes:
 nsswitch/wbinfo.c                         |    2 ++
 source3/libsmb/dsgetdcname.c              |    3 +++
 source3/winbindd/winbindd_ccache_access.c |    2 +-
 source3/winbindd/winbindd_cred_cache.c    |    2 +-
 4 files changed, 7 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/wbinfo.c b/nsswitch/wbinfo.c
index cbd4f1d..afecc86 100644
--- a/nsswitch/wbinfo.c
+++ b/nsswitch/wbinfo.c
@@ -72,6 +72,8 @@ static char winbind_separator(void)
 	sep = details->winbind_separator;
 	got_sep = true;
 
+	wbcFreeMemory(details);
+
 	if (!sep) {
 		d_fprintf(stderr, "winbind separator was NULL!\n");
 		return 0;
diff --git a/source3/libsmb/dsgetdcname.c b/source3/libsmb/dsgetdcname.c
index 6e67e05..1e1eac3 100644
--- a/source3/libsmb/dsgetdcname.c
+++ b/source3/libsmb/dsgetdcname.c
@@ -497,6 +497,7 @@ static NTSTATUS discover_dc_netbios(TALLOC_CTX *mem_ctx,
 
 	dclist = TALLOC_ZERO_ARRAY(mem_ctx, struct ip_service_name, count);
 	if (!dclist) {
+		SAFE_FREE(iplist);
 		return NT_STATUS_NO_MEMORY;
 	}
 
@@ -512,6 +513,7 @@ static NTSTATUS discover_dc_netbios(TALLOC_CTX *mem_ctx,
 		r->port = iplist[i].port;
 		r->hostname = talloc_strdup(mem_ctx, addr);
 		if (!r->hostname) {
+			SAFE_FREE(iplist);
 			return NT_STATUS_NO_MEMORY;
 		}
 
@@ -519,6 +521,7 @@ static NTSTATUS discover_dc_netbios(TALLOC_CTX *mem_ctx,
 
 	*returned_dclist = dclist;
 	*returned_count = count;
+	SAFE_FREE(iplist);
 
 	return NT_STATUS_OK;
 }
diff --git a/source3/winbindd/winbindd_ccache_access.c b/source3/winbindd/winbindd_ccache_access.c
index ff5c840..ac08f68 100644
--- a/source3/winbindd/winbindd_ccache_access.c
+++ b/source3/winbindd/winbindd_ccache_access.c
@@ -314,7 +314,7 @@ void winbindd_ccache_save(struct winbindd_cli_state *state)
 
 	/* Parse domain and username */
 
-	if (!canonicalize_username(state->request->data.ccache_ntlm_auth.user,
+	if (!canonicalize_username(state->request->data.ccache_save.user,
 				   name_domain, name_user)) {
 		DEBUG(5,("winbindd_ccache_save: cannot parse domain and user "
 			 "from name [%s]\n",
diff --git a/source3/winbindd/winbindd_cred_cache.c b/source3/winbindd/winbindd_cred_cache.c
index df09bbe..25f14f4 100644
--- a/source3/winbindd/winbindd_cred_cache.c
+++ b/source3/winbindd/winbindd_cred_cache.c
@@ -685,7 +685,7 @@ NTSTATUS remove_ccache(const char *username)
 {
 	struct WINBINDD_CCACHE_ENTRY *entry = get_ccache_by_username(username);
 	NTSTATUS status = NT_STATUS_OK;
-	#ifdef HAVE_KRB5
+#ifdef HAVE_KRB5
 	krb5_error_code ret;
 #endif
 


-- 
Samba Shared Repository