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 2955a9f55e19a9fb3377884418e661df5384aea9..adee949534b66174081f754694629474ce171f95 100644 (file)
--- 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)