[SCM] Samba Shared Repository - branch master updated

[Matthias Dieter Wallnöfer]

The branch, master has been updated
       via  ea60b72... s4:ntlmssp server - use also here the new "lp_dnsdomain()" call
       via  3bd452e... s4:auth/credentials/credentials - fix uninitalised pointers
      from  dc586b9... s3: fix outdated proto.h causing build error on AIX

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


- Log -----------------------------------------------------------------
commit ea60b72c4698791ff80f56b6fe68aa647366efea
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Oct 15 10:30:55 2009 +0200

    s4:ntlmssp server - use also here the new "lp_dnsdomain()" call

commit 3bd452e3f63b2a6ef1324f4d063d6d6e640e29cf
Author: Matthias Dieter Wallnöfer <mwallnoefer at yahoo.de>
Date:   Thu Oct 15 10:30:07 2009 +0200

    s4:auth/credentials/credentials - fix uninitalised pointers
    
    This should fix bug #6755.

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

Summary of changes:
 source4/auth/credentials/credentials.c |   42 ++++++++++++++++++++++++++-----
 source4/auth/ntlmssp/ntlmssp_server.c  |    3 +-
 2 files changed, 36 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/auth/credentials/credentials.c b/source4/auth/credentials/credentials.c
index 83901db..09366e8 100644
--- a/source4/auth/credentials/credentials.c
+++ b/source4/auth/credentials/credentials.c
@@ -37,12 +37,10 @@
 _PUBLIC_ struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx) 
 {
 	struct cli_credentials *cred = talloc(mem_ctx, struct cli_credentials);
-	if (!cred) {
+	if (cred == NULL) {
 		return cred;
 	}
 
-	cred->netlogon_creds = NULL;
-	cred->machine_account_pending = false;
 	cred->workstation_obtained = CRED_UNINITIALISED;
 	cred->username_obtained = CRED_UNINITIALISED;
 	cred->password_obtained = CRED_UNINITIALISED;
@@ -50,21 +48,51 @@ _PUBLIC_ struct cli_credentials *cli_credentials_init(TALLOC_CTX *mem_ctx)
 	cred->realm_obtained = CRED_UNINITIALISED;
 	cred->ccache_obtained = CRED_UNINITIALISED;
 	cred->client_gss_creds_obtained = CRED_UNINITIALISED;
-	cred->server_gss_creds_obtained = CRED_UNINITIALISED;
-	cred->keytab_obtained = CRED_UNINITIALISED;
 	cred->principal_obtained = CRED_UNINITIALISED;
+	cred->keytab_obtained = CRED_UNINITIALISED;
+	cred->server_gss_creds_obtained = CRED_UNINITIALISED;
 
 	cred->ccache_threshold = CRED_UNINITIALISED;
 	cred->client_gss_creds_threshold = CRED_UNINITIALISED;
 
+	cred->workstation = NULL;
+	cred->username = NULL;
+	cred->password = NULL;
 	cred->old_password = NULL;
-	cred->smb_krb5_context = NULL;
+	cred->domain = NULL;
+	cred->realm = NULL;
+	cred->principal = NULL;
 	cred->salt_principal = NULL;
-	cred->machine_account = false;
 
 	cred->bind_dn = NULL;
 
+	cred->nt_hash = NULL;
+
+	cred->ccache = NULL;
+	cred->client_gss_creds = NULL;
+	cred->keytab = NULL;
+	cred->server_gss_creds = NULL;
+
+	cred->workstation_cb = NULL;
+	cred->password_cb = NULL;
+	cred->username_cb = NULL;
+	cred->domain_cb = NULL;
+	cred->realm_cb = NULL;
+	cred->principal_cb = NULL;
+
+	cred->priv_data = NULL;
+
+	cred->netlogon_creds = NULL;
+
+	cred->smb_krb5_context = NULL;
+
+	cred->machine_account_pending = false;
+	cred->machine_account_pending_lp_ctx = NULL;
+
+	cred->machine_account = false;
+
 	cred->tries = 3;
+
 	cred->callback_running = false;
 
 	cli_credentials_set_kerberos_state(cred, CRED_AUTO_USE_KERBEROS);
diff --git a/source4/auth/ntlmssp/ntlmssp_server.c b/source4/auth/ntlmssp/ntlmssp_server.c
index b55c1cd..a56b21a 100644
--- a/source4/auth/ntlmssp/ntlmssp_server.c
+++ b/source4/auth/ntlmssp/ntlmssp_server.c
@@ -186,8 +186,7 @@ NTSTATUS ntlmssp_server_negotiate(struct gensec_security *gensec_security,
 
 		/* Find out the DNS domain name */
 		dnsdomname[0] = '\0';
-		safe_strcpy(dnsdomname, lp_realm(gensec_security->settings->lp_ctx), sizeof(dnsdomname) - 1);
-		strlower_m(dnsdomname);
+		safe_strcpy(dnsdomname, lp_dnsdomain(gensec_security->settings->lp_ctx), sizeof(dnsdomname) - 1);
 
 		/* Find out the DNS host name */
 		safe_strcpy(dnsname, gensec_ntlmssp_state->server_name, sizeof(dnsname) - 1);


-- 
Samba Shared Repository