gssapi: rename our files to avoid conflicts

gssapi.h is used as a header name by Heimdal-style GSSAPI so it would
conflict with a private header using that name, and while renaming the
header I figured we should name the .c file accordingly as well.

Bug: http://curl.haxx.se/mail/lib-2011-07/0071.html
Reported by: Ben Greear

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 1727a173cd29576d023694a793998fca53850bf1..51fc9191d173ca9fb4dc166469017ff4c581e431 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -22,7 +22,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c   \
   pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c                \
   curl_rtmp.c openldap.c curl_gethostname.c gopher.c axtls.c           \
   idn_win32.c http_negotiate_sspi.c cyassl.c http_proxy.c non-ascii.c  \
-  asyn-ares.c asyn-thread.c gssapi.c
+  asyn-ares.c asyn-thread.c curl_gssapi.c
 
 HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h      \
   progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h     \
@@ -37,4 +37,4 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h     \
   curl_base64.h rawstr.h curl_addrinfo.h curl_sspi.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 polarssl.h curl_rtmp.h curl_gethostname.h     \
-  gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h gssapi.h
+  gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h asyn.h curl_gssapi.h

diff --git a/lib/gssapi.c b/lib/curl_gssapi.c
similarity index 98%
rename from lib/gssapi.c
rename to lib/curl_gssapi.c
index 8911f5f32ed8bf8668b164da3eb175b4384873d0..69c3c88d7ee2ae3690aac18ae1cc52d9ea920753 100644 (file)
--- a/lib/gssapi.c
+++ b/lib/curl_gssapi.c
@@ -20,7 +20,7 @@
  *
  ***************************************************************************/
 
-#include "gssapi.h"
+#include "curl_gssapi.h"
 
 OM_uint32 Curl_gss_init_sec_context(
     OM_uint32 * minor_status,

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

diff --git a/lib/http_negotiate.c b/lib/http_negotiate.c
index e4a8ff2593af23e16c6ba5aabcd47f40b86c842f..36823f8cfab5efc2258945873c2480cbe4e9e49c 100644 (file)
--- a/lib/http_negotiate.c
+++ b/lib/http_negotiate.c
@@ -36,7 +36,7 @@
 
 #include "urldata.h"
 #include "sendf.h"
-#include "gssapi.h"
+#include "curl_gssapi.h"
 #include "rawstr.h"
 #include "curl_base64.h"
 #include "http_negotiate.h"

diff --git a/lib/krb5.c b/lib/krb5.c
index 34329dc6a9014bd801b9c2b75c6f6f82cfefd544..5c60c8dc4245596ff032259e6eb51d5a8fde6039 100644 (file)
--- a/lib/krb5.c
+++ b/lib/krb5.c
@@ -50,7 +50,7 @@
 #include "urldata.h"
 #include "curl_base64.h"
 #include "ftp.h"
-#include "gssapi.h"
+#include "curl_gssapi.h"
 #include "sendf.h"
 #include "krb4.h"
 #include "curl_memory.h"

diff --git a/lib/socks_gssapi.c b/lib/socks_gssapi.c
index 8af26c26a69533b2f809e4ae2a2d645ebc98f80f..872efb0e152db86db12ab01381ee72412f3a15e1 100644 (file)
--- a/lib/socks_gssapi.c
+++ b/lib/socks_gssapi.c
@@ -37,7 +37,7 @@
 #include <stdlib.h>
 #endif
 
-#include "gssapi.h"
+#include "curl_gssapi.h"
 #include "urldata.h"
 #include "sendf.h"
 #include "connect.h"