diff options
| author | Simo Sorce <idra@samba.org> | 2012-04-01 17:28:19 -0400 |
|---|---|---|
| committer | Andreas Schneider <asn@samba.org> | 2012-04-12 12:06:43 +0200 |
| commit | c13c065a9b92c1abf17e999649ea6bb620615d6f (patch) | |
| tree | 833c324e17eb32fb7d88f06531b6fe2057858f05 /source3/wscript | |
| parent | 70c303a7f357b2c73955b24128ac8a72b656d4e6 (diff) | |
| download | samba-c13c065a9b92c1abf17e999649ea6bb620615d6f.tar.gz samba-c13c065a9b92c1abf17e999649ea6bb620615d6f.tar.bz2 samba-c13c065a9b92c1abf17e999649ea6bb620615d6f.zip | |
krb5_wrap: krb5_string_to_key / krb5_encrypt_block are deprecated.
Remove checks and replace with krb5_c_string_to_key().
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/wscript')
| -rwxr-xr-x[-rw-r--r--] | source3/wscript | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/wscript b/source3/wscript index 2da00ecabe..e0a4ea742d 100644..100755 --- a/source3/wscript +++ b/source3/wscript @@ -579,8 +579,8 @@ msg.msg_acctrightslen = sizeof(fd); conf.CHECK_FUNCS_IN('krb5_mk_req_extended krb5_kt_compare', 'krb5') conf.CHECK_FUNCS(''' krb5_set_default_in_tkt_etypes krb5_set_default_tgs_enctypes -krb5_set_default_tgs_ktypes krb5_principal2salt krb5_use_enctype -krb5_string_to_key krb5_get_pw_salt krb5_string_to_key_salt krb5_auth_con_setkey +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 krb5_auth_con_setuseruserkey krb5_get_permitted_enctypes krb5_get_default_in_tkt_etypes krb5_free_data_contents krb5_principal_get_comp_string krb5_free_unparsed_name @@ -754,8 +754,9 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL_COMPARE_ANY_REALM'): Logs.warn("krb5_principal_compare_any_realm not found in -lkrb5") use_ads=False - if not conf.CONFIG_SET('HAVE_KRB5_STRING_TO_KEY'): - Logs.warn("krb5_string_to_key not found in -lkrb5") + if not conf.CONFIG_SET('HAVE_KRB5_C_STRING_TO_KEY') and \ + not conf.CONFIG_SET('HAVE_KRB5_STRING_TO_KEY_SALT'): + Logs.warn("krb5_c_string_to_key not found in -lkrb5") use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') and \ not conf.CONFIG_SET('HAVE_KRB5_GET_PW_SALT'): |