From: Steve Holme <steve_holme@hotmail.com>
Date: Sun, 27 Mar 2016 16:58:50 +0000 (+0100)
Subject: http_ntlm: Renamed from curl_ntlm.[c|h]
X-Git-Tag: curl-7_49_0~281
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f0bdd72c;p=thirdparty%2Fcurl.git

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 ce15cff059..b573e932ea 100644
--- 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 64b58392b7..d6c815e47a 100644
--- a/lib/Makefile.vc6
+++ b/lib/Makefile.vc6
@@ -540,7 +540,6 @@ X_OBJS= \
 	$(DIROBJ)\curl_gssapi.obj \
 	$(DIROBJ)\curl_memrchr.obj \
 	$(DIROBJ)\curl_multibyte.obj \
-	$(DIROBJ)\curl_ntlm.obj \
 	$(DIROBJ)\curl_ntlm_core.obj \
 	$(DIROBJ)\curl_ntlm_wb.obj \
 	$(DIROBJ)\curl_rtmp.obj \
@@ -574,6 +573,7 @@ X_OBJS= \
 	$(DIROBJ)\http_chunks.obj \
 	$(DIROBJ)\http_digest.obj \
 	$(DIROBJ)\http_negotiate.obj \
+	$(DIROBJ)\http_ntlm.obj \
 	$(DIROBJ)\http_proxy.obj \
 	$(DIROBJ)\idn_win32.obj \
 	$(DIROBJ)\if2ip.obj \
diff --git a/lib/http.c b/lib/http.c
index 7563708ac2..231a913e78 100644
--- 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 dbf567b4ef..2cd3f48180 100644
--- 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 f9c8068ea2..00a4e59dd8 100644
--- 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 224eefbb7c..be22fda5e8 100644
--- 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                                                           \