[SCM] Samba Shared Repository - branch master updated

[Andreas Schneider]

The branch, master has been updated
       via  b73235f krb5_wrap: Do not use deprecated KRB5 functions
      from  c65d174 ctdb-packaging: Set --libexecdir in RPM spec file

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


- Log -----------------------------------------------------------------
commit b73235fb54a24d5ece5ac356741a57b18493d56b
Author: Andreas Schneider <asn at samba.org>
Date:   Wed Mar 2 17:36:55 2016 +0100

    krb5_wrap: Do not use deprecated KRB5 functions
    
    Signed-off-by: Andreas Schneider <asn at samba.org>
    Reviewed-by: Guenther Deschner <gd at samba.org>
    
    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
    Autobuild-Date(master): Mon Mar  7 17:57:39 CET 2016 on sn-devel-144

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

Summary of changes:
 lib/krb5_wrap/krb5_samba.c       | 12 ++++++++++++
 wscript_configure_system_mitkrb5 |  2 ++
 2 files changed, 14 insertions(+)


Changeset truncated at 500 lines:

diff --git a/lib/krb5_wrap/krb5_samba.c b/lib/krb5_wrap/krb5_samba.c
index 13984e9..83bc8c9 100644
--- a/lib/krb5_wrap/krb5_samba.c
+++ b/lib/krb5_wrap/krb5_samba.c
@@ -866,11 +866,23 @@ bool get_krb5_smb_session_key(TALLOC_CTX *mem_ctx,
 	bool ret = false;
 
 	if (remote) {
+#ifdef HAVE_KRB5_AUTH_CON_GETRECVSUBKEY
+		err = krb5_auth_con_getrecvsubkey(context,
+						  auth_context,
+						  &skey);
+#else /* HAVE_KRB5_AUTH_CON_GETRECVSUBKEY */
 		err = krb5_auth_con_getremotesubkey(context,
 						    auth_context, &skey);
+#endif /* HAVE_KRB5_AUTH_CON_GETRECVSUBKEY */
 	} else {
+#ifdef HAVE_KRB5_AUTH_CON_GETSENDSUBKEY
+		err = krb5_auth_con_getsendsubkey(context,
+						  auth_context,
+						  &skey);
+#else /* HAVE_KRB5_AUTH_CON_GETSENDSUBKEY */
 		err = krb5_auth_con_getlocalsubkey(context,
 						   auth_context, &skey);
+#endif /* HAVE_KRB5_AUTH_CON_GETSENDSUBKEY */
 	}
 
 	if (err || skey == NULL) {
diff --git a/wscript_configure_system_mitkrb5 b/wscript_configure_system_mitkrb5
index 9c1ad8f..4353539 100644
--- a/wscript_configure_system_mitkrb5
+++ b/wscript_configure_system_mitkrb5
@@ -89,6 +89,8 @@ conf.CHECK_FUNCS_IN('''
        ''', 'gssapi gssapi_krb5')
 conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5')
 conf.CHECK_FUNCS('''
+       krb5_auth_con_getrecvsubkey
+       krb5_auth_con_getsendsubkey
        krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes
        krb5_set_default_tgs_ktypes krb5_principal2salt
        krb5_c_string_to_key krb5_get_pw_salt krb5_string_to_key_salt krb5_auth_con_setkey


-- 
Samba Shared Repository