[SCM] Samba Shared Repository - branch v3-3-test updated - release-3-2-0pre2-4218-g09d7624

[Jeremy Allison]

The branch, v3-3-test has been updated
       via  09d76244a1e3eeeb1396a707e78325320e4e4f9e (commit)
       via  2a4bf6cc1f7f20b9c95e4166b366990ed330604e (commit)
       via  d1c213b23649172ed684a22d3095f5ac95685dac (commit)
       via  ab37affd6edec0d80109a7b635bc7fdb3b84eb6b (commit)
      from  d8e629864a53d603c1bb2b08ec853d178d2d9dd3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test


- Log -----------------------------------------------------------------
commit 09d76244a1e3eeeb1396a707e78325320e4e4f9e
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 4 19:36:37 2008 -0700

    Fix an unlikely memleak found by the IBM checker

commit 2a4bf6cc1f7f20b9c95e4166b366990ed330604e
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 4 19:35:51 2008 -0700

    Fix an uninitialized variable found by the IBM Checker

commit d1c213b23649172ed684a22d3095f5ac95685dac
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 4 19:34:42 2008 -0700

    Fix a potential NULL deref in line 258 found by the IBM checker

commit ab37affd6edec0d80109a7b635bc7fdb3b84eb6b
Author: Volker Lendecke <vl at samba.org>
Date:   Sat Oct 4 19:34:02 2008 -0700

    "gwen/cc" does not like the double const :-)

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

Summary of changes:
 source/libaddns/dnsmarshall.c |    1 +
 source/libads/ldap.c          |    1 +
 source/libads/util.c          |    2 ++
 source/libnet/libnet_proto.h  |    2 +-
 4 files changed, 5 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/libaddns/dnsmarshall.c b/source/libaddns/dnsmarshall.c
index 8c3389e..5530290 100644
--- a/source/libaddns/dnsmarshall.c
+++ b/source/libaddns/dnsmarshall.c
@@ -252,6 +252,7 @@ void dns_unmarshall_domain_name(TALLOC_CTX *mem_ctx,
 
 	if (!(name = talloc(mem_ctx, struct dns_domain_name))) {
 		buf->error = ERROR_DNS_NO_MEMORY;
+		return;
 	}
 
 	dns_unmarshall_label(name, 0, buf, &name->pLabelList);
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index eb45e3a..03d02fc 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -2828,6 +2828,7 @@ ADS_STATUS ads_domain_func_level(ADS_STRUCT *ads, uint32 *val)
 		if ( (ads_s = ads_init( ads->server.realm, ads->server.workgroup, 
 			ads->server.ldap_server )) == NULL )
 		{
+			status = ADS_ERROR_NT(NT_STATUS_NO_MEMORY);
 			goto done;
 		}
 		ads_s->auth.flags = ADS_AUTH_ANON_BIND;
diff --git a/source/libads/util.c b/source/libads/util.c
index 72f5dee..d23c36f 100644
--- a/source/libads/util.c
+++ b/source/libads/util.c
@@ -86,6 +86,8 @@ ADS_STATUS ads_guess_service_principal(ADS_STRUCT *ads,
 		server_realm = SMB_STRDUP(ads->config.realm);
 
 		if (!server || !server_realm) {
+			SAFE_FREE(server);
+			SAFE_FREE(server_realm);
 			return ADS_ERROR(LDAP_NO_MEMORY);
 		}
 
diff --git a/source/libnet/libnet_proto.h b/source/libnet/libnet_proto.h
index 43046a4..69a16c1 100644
--- a/source/libnet/libnet_proto.h
+++ b/source/libnet/libnet_proto.h
@@ -53,7 +53,7 @@ krb5_error_code libnet_keytab_add(struct libnet_keytab_context *ctx);
 
 struct libnet_keytab_entry *libnet_keytab_search(struct libnet_keytab_context *ctx,
 						 const char *principal, int kvno,
-						 const const krb5_enctype enctype,
+						 const krb5_enctype enctype,
 						 TALLOC_CTX *mem_ctx);
 #endif
 


-- 
Samba Shared Repository