diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-26 15:31:02 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-26 15:31:02 +0100 |
| commit | 1e200c1952adab450909ac35252be4636c3e1053 (patch) | |
| tree | 575e1337aaec5cf8decb10567a4876c1650441c6 /source4/auth | |
| parent | ca202cf464aec82e63be4b2160f394f56b8c195e (diff) | |
| parent | 853f9283fb8fbcd2078e3cf8e99d6c8e24d77346 (diff) | |
| download | samba-1e200c1952adab450909ac35252be4636c3e1053.tar.gz samba-1e200c1952adab450909ac35252be4636c3e1053.tar.xz samba-1e200c1952adab450909ac35252be4636c3e1053.zip | |
Merge branch 'master' of git://git.samba.org/samba
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.h | 1 | ||||
| -rw-r--r-- | source4/auth/kerberos/clikrb5.c | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/source4/auth/credentials/credentials_krb5.h b/source4/auth/credentials/credentials_krb5.h index 0d0e9f330fc..5e56752eb4a 100644 --- a/source4/auth/credentials/credentials_krb5.h +++ b/source4/auth/credentials/credentials_krb5.h @@ -24,6 +24,7 @@ #define __CREDENTIALS_KRB5_H__ #include <gssapi/gssapi.h> +#include <gssapi/gssapi_krb5.h> #include <krb5.h> struct gssapi_creds_container { diff --git a/source4/auth/kerberos/clikrb5.c b/source4/auth/kerberos/clikrb5.c index cf87d13cf2a..68e7eb90cc1 100644 --- a/source4/auth/kerberos/clikrb5.c +++ b/source4/auth/kerberos/clikrb5.c @@ -74,13 +74,9 @@ void kerberos_free_data_contents(krb5_context context, krb5_data *pdata) { -#if defined(HAVE_KRB5_FREE_DATA_CONTENTS) if (pdata->data) { - krb5_free_data_contents(context, pdata); + krb5_data_free(pdata); } -#else - SAFE_FREE(pdata->data); -#endif } krb5_error_code smb_krb5_kt_free_entry(krb5_context context, krb5_keytab_entry *kt_entry) |