winbindd_cm: Replace the use of lp_realm() with our_domain->alt_name.
authorGerald W. Carter <jerry@samba.org>
Tue, 3 Jun 2008 16:18:44 +0000 (11:18 -0500)
committerGerald W. Carter <jerry@samba.org>
Tue, 3 Jun 2008 16:21:02 +0000 (11:21 -0500)
Reduce the use of config parameters with run time information after discussion
with Guenther.
(This used to be commit 57d596395db287301eefd34e62c9aaf857c34c69)

source3/winbindd/winbindd_cm.c

index a1027cec9719b7e87a9e82c7ebf25e74c07a9bbf..312d30371fe70bd49d939ebef97f9d6b65d66c79 100644 (file)
@@ -710,8 +710,14 @@ static NTSTATUS get_trust_creds(const struct winbindd_domain *domain,
 
        if (machine_krb5_principal != NULL)
        {
+               struct winbindd_domain *our_domain = find_our_domain();
+
+               if (!our_domain) {
+                       return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;                       
+               }
+               
                if (asprintf(machine_krb5_principal, "%s$@%s",
-                            account_name, lp_realm()) == -1)
+                            account_name, our_domain->alt_name) == -1)
                {
                        return NT_STATUS_NO_MEMORY;
                }