http_ntlm: Renamed from curl_ntlm.[c|h]

Renamed the header and source files for this module as they are HTTP
specific and as such, they should use the naming convention as other
HTTP authentication source files do - this revert commit 260ee6b7bf.

Note: We could also rename curl_ntlm_wb.[c|h], however, the Winbind
code needs separating from the HTTP protocol and migrating into the
vauth directory, thus adding support for Winbind to the SASL based
protocols such as IMAP, POP3 and SMTP.

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index ce15cff0593a79a62585d2d0cc6d4c1341a93c10..b573e932ead0c0e4308b45548648f46d35b770c7 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -51,7 +51,7 @@ LIB_CFILES = file.c timeval.c base64.c hostip.c progress.c formdata.c   \
   pingpong.c rtsp.c curl_threads.c warnless.c hmac.c curl_rtmp.c        \
   openldap.c curl_gethostname.c gopher.c idn_win32.c                    \
   http_proxy.c non-ascii.c asyn-ares.c asyn-thread.c curl_gssapi.c      \
-  curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_sasl.c               \
+  http_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_sasl.c               \
   curl_multibyte.c hostcheck.c conncache.c pipeline.c dotdot.c          \
   x509asn1.c http2.c smb.c curl_endian.c curl_des.c
 
@@ -68,7 +68,7 @@ LIB_HFILES = arpa_telnet.h netrc.h file.h timeval.h hostip.h progress.h \
   slist.h nonblock.h curl_memrchr.h imap.h pop3.h smtp.h pingpong.h     \
   rtsp.h curl_threads.h warnless.h curl_hmac.h curl_rtmp.h              \
   curl_gethostname.h gopher.h http_proxy.h non-ascii.h asyn.h           \
-  curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h             \
+  http_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h             \
   curl_sasl.h curl_multibyte.h hostcheck.h conncache.h                  \
   curl_setup_once.h multihandle.h setup-vms.h pipeline.h dotdot.h       \
   x509asn1.h http2.h sigpipe.h smb.h curl_endian.h curl_des.h           \

diff --git a/lib/Makefile.vc6 b/lib/Makefile.vc6
index 64b58392b7f5715a462f1f6ceb2942b026b67846..d6c815e47a9b955a773de1d09b150dcc6e6bc119 100644 (file)
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -540,7 +540,6 @@ X_OBJS= \
        $(DIROBJ)\curl_gssapi.obj \\r
        $(DIROBJ)\curl_memrchr.obj \\r
        $(DIROBJ)\curl_multibyte.obj \\r
-       $(DIROBJ)\curl_ntlm.obj \\r
        $(DIROBJ)\curl_ntlm_core.obj \\r
        $(DIROBJ)\curl_ntlm_wb.obj \\r
        $(DIROBJ)\curl_rtmp.obj \\r
@@ -574,6 +573,7 @@ X_OBJS= \
        $(DIROBJ)\http_chunks.obj \\r
        $(DIROBJ)\http_digest.obj \\r
        $(DIROBJ)\http_negotiate.obj \\r
+       $(DIROBJ)\http_ntlm.obj \\r
        $(DIROBJ)\http_proxy.obj \\r
        $(DIROBJ)\idn_win32.obj \\r
        $(DIROBJ)\if2ip.obj \\r

diff --git a/lib/http.c b/lib/http.c
index 7563708ac25657971c3d1c70ccd324a626f68d24..231a913e7803dd1f89a3a09778dd16ce71768dc2 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -57,7 +57,7 @@
 #include "vauth/vauth.h"
 #include "vtls/vtls.h"
 #include "http_digest.h"
-#include "curl_ntlm.h"
+#include "http_ntlm.h"
 #include "curl_ntlm_wb.h"
 #include "http_negotiate.h"
 #include "url.h"

diff --git a/lib/curl_ntlm.c b/lib/http_ntlm.c
similarity index 99%
rename from lib/curl_ntlm.c
rename to lib/http_ntlm.c
index dbf567b4ef3a214fa405de04aebd1e25222651ba..2cd3f481805bd4ae5dc3891a2cf8c3b9610f8bb7 100644 (file)
--- a/lib/curl_ntlm.c
+++ b/lib/http_ntlm.c
@@ -36,7 +36,7 @@
 #include "urldata.h"
 #include "sendf.h"
 #include "rawstr.h"
-#include "curl_ntlm.h"
+#include "http_ntlm.h"
 #include "curl_ntlm_wb.h"
 #include "vauth/vauth.h"
 #include "url.h"

diff --git a/lib/curl_ntlm.h b/lib/http_ntlm.h
similarity index 100%
rename from lib/curl_ntlm.h
rename to lib/http_ntlm.h

diff --git a/lib/url.c b/lib/url.c
index f9c8068ea2b09a83a7bfd3a7499df3ab9f315ce5..00a4e59dd843f839751c7e173f5f31127ca7109a 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -119,7 +119,7 @@ bool curl_win32_idn_to_ascii(const char *in, char **out);
 #include "url.h"
 #include "connect.h"
 #include "inet_ntop.h"
-#include "curl_ntlm.h"
+#include "http_ntlm.h"
 #include "curl_ntlm_wb.h"
 #include "socks.h"
 #include "curl_rtmp.h"

diff --git a/packages/Symbian/group/libcurl.mmp b/packages/Symbian/group/libcurl.mmp
index 224eefbb7cc0598148e88b01e3e3051cc01183df..be22fda5e85f22306169a24293c50d7d49f2fbb9 100644 (file)
--- a/packages/Symbian/group/libcurl.mmp
+++ b/packages/Symbian/group/libcurl.mmp
@@ -36,7 +36,7 @@ SOURCE \
   pop3.c smtp.c pingpong.c rtsp.c curl_threads.c warnless.c hmac.c     \
   vtls/polarssl.c curl_rtmp.c openldap.c curl_gethostname.c gopher.c   \
   vtls/axtls.c idn_win32.c vtls/cyassl.c http_proxy.c non-ascii.c      \
-  asyn-ares.c asyn-thread.c curl_gssapi.c curl_ntlm.c curl_ntlm_wb.c   \
+  asyn-ares.c asyn-thread.c curl_gssapi.c http_ntlm.c curl_ntlm_wb.c   \
   curl_ntlm_core.c curl_sasl.c vtls/schannel.c curl_multibyte.c        \
   vtls/darwinssl.c conncache.c curl_sasl_sspi.c smb.c curl_endian.c    \
   curl_des.c                                                           \