diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-14 15:40:28 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-14 16:38:26 +1000 |
| commit | 4ba1375526e6582d6c095592f0e82d1ba501ee3e (patch) | |
| tree | ad4ebe6a5e142733dc01c933c081adcaa542e2d0 /source4/auth/kerberos/kerberos_util.c | |
| parent | 3d7998bce1f3366e99f5b4f42d3eae934c1539b7 (diff) | |
| download | samba-4ba1375526e6582d6c095592f0e82d1ba501ee3e.tar.gz samba-4ba1375526e6582d6c095592f0e82d1ba501ee3e.tar.bz2 samba-4ba1375526e6582d6c095592f0e82d1ba501ee3e.zip | |
libcli/auth Move krb5 wrapper functions from s3 into common
This requires a small rework of the build system to ensure that the
correct #define statements are made in both the s3 and top level
builds. We now define the various HAVE_ macros in config.h at all
times, using heimdal_build/wscript_configure when that is in use.
Andrew Bartlett
Diffstat (limited to 'source4/auth/kerberos/kerberos_util.c')
| -rw-r--r-- | source4/auth/kerberos/kerberos_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/auth/kerberos/kerberos_util.c b/source4/auth/kerberos/kerberos_util.c index c5079123ef..9ac226390a 100644 --- a/source4/auth/kerberos/kerberos_util.c +++ b/source4/auth/kerberos/kerberos_util.c @@ -542,8 +542,8 @@ static krb5_error_code keytab_add_keys(TALLOC_CTX *parent_ctx, ZERO_STRUCT(entry); - ret = create_kerberos_key_from_string(smb_krb5_context->krb5_context, - salt_princ, &password, &entry.keyblock, enctypes[i]); + ret = create_kerberos_key_from_string_direct(smb_krb5_context->krb5_context, + salt_princ, &password, &entry.keyblock, enctypes[i]); if (ret != 0) { return ret; } |