reverted kerberos-related functrions to C linkage

diff --git a/src/peer_proxy_negotiate_auth.cc b/src/peer_proxy_negotiate_auth.cc
index 7988fb9bc18c68780ae50c9efe648eb04e702fc6..1f926b4654080b9afcde0e1f76f367d39724900e 100644 (file)
--- a/src/peer_proxy_negotiate_auth.cc
+++ b/src/peer_proxy_negotiate_auth.cc
@@ -33,6 +33,10 @@
 #include "Debug.h"
 #include "peer_proxy_negotiate_auth.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #if HAVE_PROFILE_H
 #include <profile.h>
 #endif                         /* HAVE_PROFILE_H */
@@ -543,4 +547,7 @@ cleanup:
         return token;
     }
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* HAVE_KRB5 && HAVE_GSSAPI */

diff --git a/src/peer_proxy_negotiate_auth.h b/src/peer_proxy_negotiate_auth.h
index c4cf6333229951e9dc366f85998eb8e1348ad269..36c3a792cb3dadd1443960fca9c18ff0ca1ef709 100644 (file)
--- a/src/peer_proxy_negotiate_auth.h
+++ b/src/peer_proxy_negotiate_auth.h
@@ -34,7 +34,7 @@
 
 #if HAVE_AUTH_MODULE_NEGOTIATE && HAVE_KRB5 && HAVE_GSSAPI
     /* upstream proxy authentication */
-extern char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
+SQUIDCEXTERN char *peer_proxy_negotiate_auth(char *principal_name, char *proxy);
 #endif