From: Jeremy Allison <jra@samba.org>
Date: Wed, 22 Dec 2004 22:07:04 +0000 (+0000)
Subject: r4334: Fix for bugid #2186 - from Buck Huppmann <buckh@pobox.com>
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~5461
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c3f9c81a8fcb26f7110f75b3096d5d1eb30aac13;p=thirdparty%2Fsamba.git

r4334: Fix for bugid #2186 - from Buck Huppmann <buckh@pobox.com>
to prevent uninitialized creds being freed.
Jeremy.
---

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index c6b6570f5c4..6ebada94d71 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -1527,6 +1527,9 @@ int fstr_sprintf(fstring s, const char *fmt, ...)
 /**
  Some platforms don't have strndup.
 **/
+#if defined(PARANOID_MALLOC_CHECKER)
+#undef strndup
+#endif
 
  char *strndup(const char *s, size_t n)
 {
@@ -1541,6 +1544,11 @@ int fstr_sprintf(fstring s, const char *fmt, ...)
 
 	return ret;
 }
+
+#if defined(PARANOID_MALLOC_CHECKER)
+#define strndup(s,n) __ERROR_DONT_USE_STRNDUP_DIRECTLY
+#endif
+
 #endif
 
 #if !defined(HAVE_STRNLEN) || defined(BROKEN_STRNLEN)
diff --git a/source/libads/kerberos.c b/source/libads/kerberos.c
index a38f3c35b1a..b08e28e0ba4 100644
--- a/source/libads/kerberos.c
+++ b/source/libads/kerberos.c
@@ -320,6 +320,8 @@ static krb5_error_code get_service_ticket(krb5_context ctx,
 	krb5_auth_context auth_context = NULL;
 	krb5_error_code err = 0;
 
+	ZERO_STRUCT(creds);
+
 	asprintf(&machine_account, "%s$@%s", global_myname(), lp_realm());
 	if (machine_account == NULL) {
 		goto out;
@@ -340,7 +342,6 @@ static krb5_error_code get_service_ticket(krb5_context ctx,
 	   ticket to ourselves. */
 
 	/* Set up the enctype and client and server principal fields for krb5_get_credentials. */
-	memset(&creds, '\0', sizeof(creds));
 	kerberos_set_creds_enctype(&creds, enctype);
 
 	if ((err = krb5_cc_get_principal(ctx, ccache, &creds.client))) {