diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2005-01-02 23:53:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:08:12 -0500 |
| commit | 0dcd4645961c5d672b9526538eaddf0503db793a (patch) | |
| tree | d6723b21fc30ff1a1e6b73aa851e1bedfc446c77 /source4/param | |
| parent | 022bc635ef40827e778e08ee27cb8f16bf28c90b (diff) | |
| download | samba-0dcd4645961c5d672b9526538eaddf0503db793a.tar.gz samba-0dcd4645961c5d672b9526538eaddf0503db793a.tar.bz2 samba-0dcd4645961c5d672b9526538eaddf0503db793a.zip | |
r4494: Allow gensec_gssapi to use the SPNEGO mech provided by Heimdal (off by
default at this point), and include the GSSAPI OIDs in our source, per
advice by lha that this is easier than getting the includes right.
Andrew Bartlett
(This used to be commit 9ff8b2b4d12d364084df5c95a752ce2a0546053d)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/loadparm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index e06daf92c1..00c9133067 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -3078,7 +3078,8 @@ BOOL lp_load(const char *pszFname, BOOL global_only, BOOL save_defaults, lp_do_parameter(-1, "wins server", "127.0.0.1"); } - lp_do_parameter(-1, "gensec:gssapi", "False"); + lp_do_parameter(-1, "gensec:gssapi_krb5", "False"); + lp_do_parameter(-1, "gensec:gssapi_spnego", "False"); lp_do_parameter(-1, "gensec:krb5", "False"); lp_do_parameter(-1, "gensec:ms_krb5", "False"); |