diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-16 15:33:58 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:34 +0100 |
| commit | 1afe0549163bbc639ae1a030239c9ebcd1b922bf (patch) | |
| tree | 967da56818175f109e818df9a1a72f1d1bdbf546 /source4/auth | |
| parent | eb2c71912baceb1a6884ce143ae91f1e3d2a69fb (diff) | |
| download | samba-1afe0549163bbc639ae1a030239c9ebcd1b922bf.tar.gz samba-1afe0549163bbc639ae1a030239c9ebcd1b922bf.tar.bz2 samba-1afe0549163bbc639ae1a030239c9ebcd1b922bf.zip | |
r26474: Move credentials-specific kerberos file to credentials subsystem. Fixes missing symbols in some of the python bindings.
(This used to be commit e26d0fff6d40899113196ac35a86a9baa10cc9c2)
Diffstat (limited to 'source4/auth')
| -rw-r--r-- | source4/auth/credentials/config.mk | 5 | ||||
| -rw-r--r-- | source4/auth/credentials/credentials_krb5.h | 1 | ||||
| -rw-r--r-- | source4/auth/kerberos/config.mk | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk index c8fb8c8628..1a6c1487b0 100644 --- a/source4/auth/credentials/config.mk +++ b/source4/auth/credentials/config.mk @@ -17,9 +17,10 @@ PRIVATE_DEPENDENCIES = CREDENTIALS_KRB5 [SUBSYSTEM::CREDENTIALS_KRB5] PUBLIC_PROTO_HEADER = credentials_krb5_proto.h PUBLIC_HEADERS = credentials_krb5.h -OBJ_FILES = credentials_krb5.o +OBJ_FILES = credentials_krb5.o \ + ../kerberos/kerberos_util.o PUBLIC_DEPENDENCIES = \ - HEIMDAL_GSSAPI + HEIMDAL_GSSAPI KERBEROS # End SUBSYSTEM CREDENTIALS ################################# diff --git a/source4/auth/credentials/credentials_krb5.h b/source4/auth/credentials/credentials_krb5.h index 1026508601..bf6047edf3 100644 --- a/source4/auth/credentials/credentials_krb5.h +++ b/source4/auth/credentials/credentials_krb5.h @@ -21,6 +21,7 @@ */ #include <gssapi/gssapi.h> +#include <krb5.h> struct ccache_container; diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk index c3f8c6f8ce..7493a6d06d 100644 --- a/source4/auth/kerberos/config.mk +++ b/source4/auth/kerberos/config.mk @@ -5,11 +5,10 @@ PRIVATE_PROTO_HEADER = proto.h OBJ_FILES = kerberos.o \ clikrb5.o \ kerberos_heimdal.o \ - kerberos_util.o \ kerberos_pac.o \ gssapi_parse.o \ krb5_init_context.o PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE -PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply CREDENTIALS_KRB5 LIBPACKET LIBNDR +PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBPACKET LIBNDR # End SUBSYSTEM KERBEROS ################################# |