[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1617-g9cf3a98

[Günther Deschner]

The branch, v3-2-test has been updated
       via  9cf3a98eacea2dd07f89245f147e002b3f49482e (commit)
      from  f12ac1ecedd6634d8ccc54d8fce8382514e3322f (commit)

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


- Log -----------------------------------------------------------------
commit 9cf3a98eacea2dd07f89245f147e002b3f49482e
Author: Günther Deschner <gd at samba.org>
Date:   Wed Jan 23 12:03:51 2008 +0100

    Fix get_trust_creds() to return always an upper-cased krb5 principal (this
    fixes winbind krb5 session at least with heimdal).
    
    Guenther

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

Summary of changes:
 source/winbindd/winbindd_cm.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/winbindd/winbindd_cm.c b/source/winbindd/winbindd_cm.c
index ef159f0..ac122fb 100644
--- a/source/winbindd/winbindd_cm.c
+++ b/source/winbindd/winbindd_cm.c
@@ -694,11 +694,15 @@ static NTSTATUS get_trust_creds(const struct winbindd_domain *domain,
 
 	/* this is at least correct when domain is our domain,
 	 * which is the only case, when this is currently used: */
-	if ((machine_krb5_principal != NULL) &&
-	    (asprintf(machine_krb5_principal, "%s$@%s", account_name,
-		      domain->alt_name) == -1))
+	if (machine_krb5_principal != NULL)
 	{
-		return NT_STATUS_NO_MEMORY;
+		if (asprintf(machine_krb5_principal, "%s$@%s",
+			     account_name, domain->alt_name) == -1)
+		{
+			return NT_STATUS_NO_MEMORY;
+		}
+
+		strupper_m(*machine_krb5_principal);
 	}
 
 	return NT_STATUS_OK;


-- 
Samba Shared Repository