diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 21:36:49 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-08-01 21:36:49 +0200 |
| commit | b1f85bfb005c4f6c93cf88779e3a12abbd99c973 (patch) | |
| tree | 404dc0a9a298e7ef6a3f3e68f1b937b0dead1894 /source4/auth | |
| parent | 47124efe420f4f4f08494cbb2255eacdc9625c8d (diff) | |
| parent | d9ad17f945d21d50ea629e22db3ee8758be421a6 (diff) | |
| download | samba-b1f85bfb005c4f6c93cf88779e3a12abbd99c973.tar.gz samba-b1f85bfb005c4f6c93cf88779e3a12abbd99c973.tar.bz2 samba-b1f85bfb005c4f6c93cf88779e3a12abbd99c973.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into manpage
(This used to be commit 8e201ecf3e86c3c8865c7276fad8dad07106efaf)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/kerberos/kerberos.c | 1 | ||||
| -rw-r--r-- | source4/auth/kerberos/krb5_init_context.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source4/auth/kerberos/kerberos.c b/source4/auth/kerberos/kerberos.c index b3b0b20f18..2579ab20cc 100644 --- a/source4/auth/kerberos/kerberos.c +++ b/source4/auth/kerberos/kerberos.c @@ -23,7 +23,6 @@ #include "includes.h" #include "system/kerberos.h" -#include "roken.h" #ifdef HAVE_KRB5 diff --git a/source4/auth/kerberos/krb5_init_context.h b/source4/auth/kerberos/krb5_init_context.h index 815e9a639d..162a19a4ab 100644 --- a/source4/auth/kerberos/krb5_init_context.h +++ b/source4/auth/kerberos/krb5_init_context.h @@ -18,7 +18,7 @@ */ struct smb_krb5_context { - struct krb5_context_data *krb5_context; + krb5_context krb5_context; krb5_log_facility *logf; }; |