------------------------------------------------------------ revno: 13331 revision-id: squid3@treenet.co.nz-20140330042016-qmc0t2xzjhdmvwg2 parent: squid3@treenet.co.nz-20140330041707-5qd4afcarffegp7m committer: Amos Jeffries branch nick: trunk timestamp: Sat 2014-03-29 22:20:16 -0600 message: squidclient: fix header includes for GSSAPI code ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20140330042016-qmc0t2xzjhdmvwg2 # target_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # testament_sha1: f330df72e04179f4d6056d6436b6220904f989e6 # timestamp: 2014-03-30 04:54:02 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/trunk/ # base_revision_id: squid3@treenet.co.nz-20140330041707-\ # 5qd4afcarffegp7m # # Begin patch === modified file 'tools/squidclient/gssapi_support.cc' --- tools/squidclient/gssapi_support.cc 2014-03-30 01:47:38 +0000 +++ tools/squidclient/gssapi_support.cc 2014-03-30 04:20:16 +0000 @@ -1,8 +1,11 @@ #include "squid.h" + +#if HAVE_GSSAPI + #include "base64.h" #include "tools/squidclient/gssapi_support.h" -#if HAVE_GSSAPI +#include #if !defined(gss_mech_spnego) static gss_OID_desc _gss_mech_spnego = {6, (void *) "\x2b\x06\x01\x05\x05\x02"};