diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-11-07 12:50:24 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:25:06 -0500 |
| commit | 14b00f10d9279b580c8bc6479b9e0402a74daf11 (patch) | |
| tree | a9644d89c68ac6f6d96fb355201a36c3bfd952e8 /source4 | |
| parent | 6f9bed3d3eb71666d8418bcab992d878eadca0c7 (diff) | |
| download | samba-14b00f10d9279b580c8bc6479b9e0402a74daf11.tar.gz samba-14b00f10d9279b580c8bc6479b9e0402a74daf11.tar.bz2 samba-14b00f10d9279b580c8bc6479b9e0402a74daf11.zip | |
r19616: the heimdal spnego mech doesn't seem to use roken.h and isn't portable
(it doesn't compile on suse 10.1 because gethostname() isn't found,
unistd.h isn't included...)
as we don't need the spnego mech, disable it till it gets fixed in heimdal
metze
(This used to be commit 0a52e11a9c34281c9ea284e007086b2ae6fce6c7)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal/lib/gssapi/mech/gss_mech_switch.c | 2 | ||||
| -rw-r--r-- | source4/heimdal_build/config.mk | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/source4/heimdal/lib/gssapi/mech/gss_mech_switch.c b/source4/heimdal/lib/gssapi/mech/gss_mech_switch.c index 3d01ba69d4..b6f261fe29 100644 --- a/source4/heimdal/lib/gssapi/mech/gss_mech_switch.c +++ b/source4/heimdal/lib/gssapi/mech/gss_mech_switch.c @@ -213,7 +213,9 @@ _gss_load_mech(void) } add_builtin(__gss_krb5_initialize()); +#ifndef _SAMBA_BUILD_ add_builtin(__gss_spnego_initialize()); +#endif fp = fopen(_PATH_GSS_MECH, "r"); if (!fp) { diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index fd3c60b670..a39a2ffd05 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -122,18 +122,6 @@ OBJ_FILES = \ ../heimdal/lib/gssapi/mech/gss_release_name.o \ ../heimdal/lib/gssapi/mech/gss_set_cred_option.o \ ../heimdal/lib/gssapi/mech/asn1_GSSAPIContextToken.o \ - ../heimdal/lib/gssapi/spnego/init_sec_context.o \ - ../heimdal/lib/gssapi/spnego/external.o \ - ../heimdal/lib/gssapi/spnego/compat.o \ - ../heimdal/lib/gssapi/spnego/context_stubs.o \ - ../heimdal/lib/gssapi/spnego/cred_stubs.o \ - ../heimdal/lib/gssapi/spnego/accept_sec_context.o \ - ../heimdal/lib/gssapi/spnego/asn1_ContextFlags.o \ - ../heimdal/lib/gssapi/spnego/asn1_MechType.o \ - ../heimdal/lib/gssapi/spnego/asn1_MechTypeList.o \ - ../heimdal/lib/gssapi/spnego/asn1_NegHints.o \ - ../heimdal/lib/gssapi/spnego/asn1_NegTokenInit.o \ - ../heimdal/lib/gssapi/spnego/asn1_NegTokenResp.o \ ../heimdal/lib/gssapi/krb5/copy_ccache.o \ ../heimdal/lib/gssapi/krb5/delete_sec_context.o \ ../heimdal/lib/gssapi/krb5/init_sec_context.o \ |