svn commit: lorikeet r661 - in trunk/heimdal/lib/gssapi/mech: .

[abartlet at samba.org]

Author: abartlet
Date: 2006-11-08 23:54:42 +0000 (Wed, 08 Nov 2006)
New Revision: 661

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=lorikeet&rev=661

Log:
Merge back from Samba4.  For the moment, we don't use Heimdal's SPNEGO.

Andrew Bartlett

Modified:
   trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c


Changeset:
Modified: trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c
===================================================================
--- trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c	2006-11-08 23:20:37 UTC (rev 660)
+++ trunk/heimdal/lib/gssapi/mech/gss_mech_switch.c	2006-11-08 23:54:42 UTC (rev 661)
@@ -213,7 +213,9 @@
 	}
 
 	add_builtin(__gss_krb5_initialize());
+#ifndef _SAMBA_BUILD_
 	add_builtin(__gss_spnego_initialize());
+#endif
 
 	fp = fopen(_PATH_GSS_MECH, "r");
 	if (!fp) {