From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Fri, 31 Aug 2012 14:15:27 +0000 (+0200)
Subject: Moved peer_proxy_negotiate_auth prototype to new peer_proxy_negotiate_auth.hi
X-Git-Tag: sourceformat-review-1~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6ff204fc8223b5f5c6ae75b5acc201f67c254875;p=thirdparty%2Fsquid.git

Moved peer_proxy_negotiate_auth prototype to new peer_proxy_negotiate_auth.hi
---

diff --git a/src/Makefile.am b/src/Makefile.am
index ee99ba0a31..6320bfa994 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -430,6 +430,7 @@ squid_SOURCES = \
 	pconn.h \
 	PeerDigest.h \
 	peer_digest.cc \
+	peer_proxy_negotiate_auth.h \
 	peer_proxy_negotiate_auth.cc \
 	peer_select.cc \
 	peer_sourcehash.h \
@@ -1451,6 +1452,7 @@ tests_testCacheManager_SOURCES = \
 	Parsing.cc \
 	pconn.cc \
 	peer_digest.cc \
+	peer_proxy_negotiate_auth.h \
 	peer_proxy_negotiate_auth.cc \
 	peer_select.cc \
 	peer_sourcehash.h \
@@ -1841,6 +1843,7 @@ tests_testEvent_SOURCES = \
 	Parsing.cc \
 	pconn.cc \
 	peer_digest.cc \
+	peer_proxy_negotiate_auth.h \
 	peer_proxy_negotiate_auth.cc \
 	peer_select.cc \
 	peer_sourcehash.h \
@@ -2071,6 +2074,7 @@ tests_testEventLoop_SOURCES = \
 	Parsing.cc \
 	pconn.cc \
 	peer_digest.cc \
+	peer_proxy_negotiate_auth.h \
 	peer_proxy_negotiate_auth.cc \
 	peer_select.cc \
 	peer_sourcehash.h \
@@ -2297,6 +2301,7 @@ tests_test_http_range_SOURCES = \
 	Packer.cc \
 	Parsing.cc \
 	peer_digest.cc \
+	peer_proxy_negotiate_auth.h \
 	peer_proxy_negotiate_auth.cc \
 	peer_select.cc \
 	peer_sourcehash.h \
@@ -2567,6 +2572,7 @@ tests_testHttpRequest_SOURCES = \
 	Parsing.cc \
 	pconn.cc \
 	peer_digest.cc \
+	peer_proxy_negotiate_auth.h \
 	peer_proxy_negotiate_auth.cc \
 	peer_select.cc \
 	peer_sourcehash.h \
@@ -3614,6 +3620,7 @@ tests_testURL_SOURCES = \
 	Parsing.cc \
 	pconn.cc \
 	peer_digest.cc \
+	peer_proxy_negotiate_auth.h \
 	peer_proxy_negotiate_auth.cc \
 	peer_select.cc \
 	peer_sourcehash.h \
diff --git a/src/http.cc b/src/http.cc
index a34be79e7f..5de0168679 100644
--- a/src/http.cc
+++ b/src/http.cc
@@ -61,6 +61,7 @@
 #include "MemObject.h"
 #include "mime_header.h"
 #include "neighbors.h"
+#include "peer_proxy_negotiate_auth.h"
 #include "profiler/Profiler.h"
 #include "protos.h"
 #include "refresh.h"
diff --git a/src/peer_proxy_negotiate_auth.cc b/src/peer_proxy_negotiate_auth.cc
index a5971b9d5a..1f926b4654 100644
--- a/src/peer_proxy_negotiate_auth.cc
+++ b/src/peer_proxy_negotiate_auth.cc
@@ -26,10 +26,13 @@
  */
 
 #include "squid.h"
+
+#if HAVE_KRB5 && HAVE_GSSAPI
+
 #include "base64.h"
 #include "Debug.h"
+#include "peer_proxy_negotiate_auth.h"
 
-#if HAVE_KRB5 && HAVE_GSSAPI
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/peer_proxy_negotiate_auth.h b/src/peer_proxy_negotiate_auth.h
new file mode 100644
index 0000000000..c4cf633322
--- /dev/null
+++ b/src/peer_proxy_negotiate_auth.h
@@ -0,0 +1,41 @@
+#ifndef SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_
+#define SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_
+/*
+ * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
+ * AUTHOR: Markus Moeller (markus_moeller at compuserve.com)
+ *
+ * SQUID Web Proxy Cache          http://www.squid-cache.org/
+ * ----------------------------------------------------------
+ *
+ *  Squid is the result of efforts by numerous individuals from
+ *  the Internet community; see the CONTRIBUTORS file for full
+ *  details.   Many organizations have provided support for Squid's
+ *  development; see the SPONSORS file for full details.  Squid is
+ *  Copyrighted (C) 2001 by the Regents of the University of
+ *  California; see the COPYRIGHT file for full details.  Squid
+ *  incorporates software developed and/or copyrighted by other
+ *  sources; see the CREDITS file for full details.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
+ *
+ */
+
+#if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI
+    /* upstream proxy authentication */
+extern char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
+#endif
+
+
+#endif /* SQUID_PEER_PROXY_NEGOTIATE_AUTH_H_ */
diff --git a/src/protos.h b/src/protos.h
index ca34910981..c99fa1042f 100644
--- a/src/protos.h
+++ b/src/protos.h
@@ -97,10 +97,6 @@ extern void reconfigure(int);
 
 #if USE_AUTH
 
-#if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI
-    /* upstream proxy authentication */
-    SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
-#endif
 
     namespace Auth {
     /* call to ensure the auth component schemes exist. */