[Freeipa-devel] [PATCH] use 'dedicated keytab file' parameter value instead of hard-coded string

[Alexander Bokovoy]

Hi,

another small two-line cleanup. We already set 'dedicated keytab file'
in smb.conf when installing trusts via ipa-adtrust-install.

-- 
/ Alexander Bokovoy
-------------- next part --------------
>From 48340d9c7dcdd10fa03ee8c4f4894a077babd42e Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <abokovoy at redhat.com>
Date: Fri, 6 Jul 2012 12:43:50 +0300
Subject: [PATCH 5/5] Use smb.conf 'dedicated keytab file' parameter instead
 of hard-coded value

---
 daemons/ipa-sam/ipa_sam.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/daemons/ipa-sam/ipa_sam.c b/daemons/ipa-sam/ipa_sam.c
index 153733dbfea35cf1426f73827fb83753c259491b..29fc95e457179716c1c70c6f061b1cde9e3f472b 100644
--- a/daemons/ipa-sam/ipa_sam.c
+++ b/daemons/ipa-sam/ipa_sam.c
@@ -3159,6 +3159,7 @@ static void bind_callback_cleanup(struct ipasam_sasl_interact_priv *data, krb5_e
 	data->context = NULL;
 }
 
+extern const char * lp_dedicated_keytab_file(void);
 static int bind_callback(LDAP *ldap_struct, struct smbldap_state *ldap_state, void* ipasam_priv)
 {
 	krb5_error_code rc;
@@ -3200,7 +3201,7 @@ static int bind_callback(LDAP *ldap_struct, struct smbldap_state *ldap_state, vo
 		return LDAP_LOCAL_ERROR;
 	}
 
-	rc = krb5_kt_resolve(data.context, "FILE:/etc/samba/samba.keytab", &data.keytab);
+	rc = krb5_kt_resolve(data.context, lp_dedicated_keytab_file(), &data.keytab);
 	if (rc) {
 		bind_callback_cleanup(&data, rc);
 		return LDAP_LOCAL_ERROR;
-- 
1.7.10.4