From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Mon, 1 Feb 2010 12:47:44 +0000 (+0100)
Subject: Merge error when removing optional kerberos/spnegohelp/ library
X-Git-Tag: SQUID_3_0_STABLE23~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa7558b937a12ea63741ec444e3e333ef036beec;p=thirdparty%2Fsquid.git

Merge error when removing optional kerberos/spnegohelp/ library
---

diff --git a/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c b/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
index 2955a9f55e..adee949534 100644
--- a/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
+++ b/helpers/negotiate_auth/squid_kerb_auth/squid_kerb_auth.c
@@ -395,25 +395,8 @@ int main(int argc, char * const argv[])
 
 
     if (output_token.length) {
-#ifndef HAVE_SPNEGO
-      if (spnego_flag) {
-	if ((rc=makeNegTokenTarg (output_token.value,
-				  output_token.length,
-				  &spnegoToken,
-				  &spnegoTokenLength))!=0 ) {
-	  if (debug)
-	    fprintf(stderr, "%s| %s: makeNegTokenTarg failed with rc=%d\n", LogTime(), PROGRAM, rc);
-	  fprintf(stdout, "NA makeNegTokenTarg failed with rc=%d\n",rc);
-	  goto cleanup;
-	}
-      } else {
-	spnegoToken = output_token.value;
-	spnegoTokenLength = output_token.length;
-      }
-#else
       spnegoToken = output_token.value;
       spnegoTokenLength = output_token.length;
-#endif
       token = malloc(base64_encode_len(spnegoTokenLength));
       if (token == NULL) {
 	if (debug)