diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-01-05 10:59:44 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-01-10 21:50:07 +0100 |
| commit | fc7b34c83a2fe44b905e8af44dcb6d06154f688d (patch) | |
| tree | 03bae2c96214be4eeec94d6208bdbdecfa148cee | |
| parent | 016fc0af0c30a22d0154ca6c67bb31bac893fb7b (diff) | |
| download | samba-fc7b34c83a2fe44b905e8af44dcb6d06154f688d.tar.gz samba-fc7b34c83a2fe44b905e8af44dcb6d06154f688d.tar.bz2 samba-fc7b34c83a2fe44b905e8af44dcb6d06154f688d.zip | |
krb5: Require krb5_fwd_tgt_creds to be available to build with krb5
| -rw-r--r-- | source3/configure.in | 6 | ||||
| -rw-r--r-- | source3/libsmb/clikrb5.c | 6 | ||||
| -rw-r--r-- | source3/wscript | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in index a2f414b408..914b7145da 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4434,6 +4434,12 @@ if test x"$with_ads_support" != x"no"; then use_ads=no fi + if test x"$ac_cv_func_ext_krb5_fwd_tgt_creds" != x"yes" + then + AC_MSG_WARN(krb5_fwd_tgt_creds not found in -lkrb5) + use_ads=no + fi + if test x"$ac_cv_func_ext_krb5_principal2salt" != x"yes" -a \ x"$ac_cv_func_ext_krb5_get_pw_salt" != x"yes" then diff --git a/source3/libsmb/clikrb5.c b/source3/libsmb/clikrb5.c index 1bd3cede97..76681198b4 100644 --- a/source3/libsmb/clikrb5.c +++ b/source3/libsmb/clikrb5.c @@ -538,7 +538,7 @@ static krb5_error_code setup_auth_context(krb5_context context, return retval; } -#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) +#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) static krb5_error_code create_gss_checksum(krb5_data *in_data, /* [inout] */ uint32_t gss_flags) { @@ -690,7 +690,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context, goto cleanup_creds; } -#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) +#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) { uint32_t gss_flags = 0; @@ -779,7 +779,7 @@ static krb5_error_code ads_krb5_mk_req(krb5_context context, error_message(retval))); } -#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_FWD_TGT_CREDS) && defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) +#if defined(TKT_FLG_OK_AS_DELEGATE ) && defined(HAVE_KRB5_AUTH_CON_SETUSERUSERKEY) && defined(KRB5_AUTH_CONTEXT_USE_SUBKEY) && defined(HAVE_KRB5_AUTH_CON_SET_REQ_CKSUMTYPE) cleanup_data: #endif diff --git a/source3/wscript b/source3/wscript index e7d9dc09c4..33ff56aa2d 100644 --- a/source3/wscript +++ b/source3/wscript @@ -756,6 +756,9 @@ return krb5_kt_resolve(context, "WRFILE:api", &keytab); if not conf.CONFIG_SET('HAVE_KRB5_FREE_HOST_REALM'): Logs.warn("krb5_free_host_realm not found in -lkrb5") use_ads=False + if not conf.CONFIG_SET('HAVE_KRB5_FWD_TGT_CREDS'): + Logs.warn("krb5_fwd_tgt_creds found in -lkrb5") + use_ads=False if not conf.CONFIG_SET('HAVE_KRB5_PRINCIPAL2SALT') and \ not conf.CONFIG_SET('HAVE_KRB5_GET_PW_SALT'): Logs.warn("no CREATE_KEY_FUNCTIONS detected") |