diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2004-01-05 23:25:56 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2004-01-05 23:25:56 +0000 |
| commit | 4e1f6feba61aa98bfc552d29acb20efc0f5c2880 (patch) | |
| tree | 53b498f6b7ac04ae3f00b1c6b4eb73ed82176bbe | |
| parent | ba82ad14c6ef43551b99e2a3abdfd434e1810339 (diff) | |
| download | samba-4e1f6feba61aa98bfc552d29acb20efc0f5c2880.tar.gz samba-4e1f6feba61aa98bfc552d29acb20efc0f5c2880.tar.bz2 samba-4e1f6feba61aa98bfc552d29acb20efc0f5c2880.zip | |
(merge from 3.0)
Remove testing hack
Make the name of the NTLMSSP client more consistant before we lock it in stone.
Andrew Bartlett
(This used to be commit 273dcda9ce62eb04c9cce673bb49b41982b26d98)
| -rw-r--r-- | source3/utils/ntlm_auth.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c index 788b5de537..8e688d9614 100644 --- a/source3/utils/ntlm_auth.c +++ b/source3/utils/ntlm_auth.c @@ -24,8 +24,6 @@ #include "includes.h" -#undef HAVE_KRB5 - #undef DBGC_CLASS #define DBGC_CLASS DBGC_WINBIND @@ -35,7 +33,7 @@ enum stdio_helper_mode { SQUID_2_4_BASIC, SQUID_2_5_BASIC, SQUID_2_5_NTLMSSP, - CLIENT_NTLMSSP_1, + NTLMSSP_CLIENT_1, GSS_SPNEGO, GSS_SPNEGO_CLIENT, NUM_HELPER_MODES @@ -75,7 +73,7 @@ static const struct { { SQUID_2_4_BASIC, "squid-2.4-basic", manage_squid_basic_request}, { SQUID_2_5_BASIC, "squid-2.5-basic", manage_squid_basic_request}, { SQUID_2_5_NTLMSSP, "squid-2.5-ntlmssp", manage_squid_ntlmssp_request}, - { CLIENT_NTLMSSP_1, "client-ntlmssp-1", manage_client_ntlmssp_request}, + { NTLMSSP_CLIENT_1, "ntlmssp-client-1", manage_client_ntlmssp_request}, { GSS_SPNEGO, "gss-spnego", manage_gss_spnego_request}, { GSS_SPNEGO_CLIENT, "gss-spnego-client", manage_gss_spnego_client_request}, { NUM_HELPER_MODES, NULL, NULL} |