Commit afbee791 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

tool: always provide negotiate/kerberos options 

libcurl can still be built with it, even if the tool is not. Maintain
independence!
parent 2546134b

src/tool_getparam.c

+0 −4
Original line number Diff line number Diff line
@@ -158,12 +158,10 @@ static const struct LongShort aliases[]= { 
  {"$3", "keepalive-time",           TRUE},

  {"$4", "post302",                  FALSE},

  {"$5", "noproxy",                  TRUE},

#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)

  {"$6", "socks5-gssapi-service",    TRUE},

  {"$7", "socks5-gssapi-nec",        FALSE},

  {"$O", "proxy-service-name",       TRUE},

  {"$P", "service-name",             TRUE},

#endif

  {"$8", "proxy1.0",                 TRUE},

  {"$9", "tftp-blksize",             TRUE},

  {"$A", "mail-from",                TRUE},
@@ -898,7 +896,6 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ 
        /* This specifies the noproxy list */

        GetStr(&config->noproxy, nextarg);

        break;

#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)

      case '6': /* --socks5-gssapi-service */

        GetStr(&config->socks5_gssapi_service, nextarg);

        break;
@@ -911,7 +908,6 @@ ParameterError getparameter(char *flag, /* f or -long-flag */ 
      case 'P': /* --service-name */

        GetStr(&config->service_name, nextarg);

        break;

#endif

      case '8': /* --proxy1.0 */

        /* http 1.0 proxy */

        GetStr(&config->proxy, nextarg);

src/tool_help.c

+0 −4
Original line number Diff line number Diff line
@@ -174,10 +174,8 @@ static const char *const helptext[] = { 
  "     --proxy-negotiate  "

  "Use HTTP Negotiate (SPNEGO) authentication on the proxy (H)",

  "     --proxy-ntlm    Use NTLM authentication on the proxy (H)",

#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)

  "     --proxy-service-name NAME  SPNEGO proxy service name",

  "     --service-name NAME  SPNEGO service name",

#endif

  " -U, --proxy-user USER[:PASSWORD]  Proxy user and password",

  "     --proxy1.0 HOST[:PORT]  Use HTTP/1.0 proxy on given port",

  " -p, --proxytunnel   Operate through a HTTP proxy tunnel (using CONNECT)",
@@ -206,10 +204,8 @@ static const char *const helptext[] = { 
  "     --socks5 HOST[:PORT]  SOCKS5 proxy on given host + port",

  "     --socks5-hostname HOST[:PORT]  "

  "SOCKS5 proxy, pass host name to proxy",

#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)

  "     --socks5-gssapi-service NAME  SOCKS5 proxy service name for GSS-API",

  "     --socks5-gssapi-nec  Compatibility with NEC SOCKS5 server",

#endif

  " -Y, --speed-limit RATE  "

  "Stop transfers below RATE for 'speed-time' secs",

  " -y, --speed-time SECONDS  "

src/tool_operate.c

+19 −25
Original line number Diff line number Diff line
@@ -1204,10 +1204,6 @@ static CURLcode operate_do(struct GlobalConfig *global, 
          my_setopt_enum(curl, CURLOPT_FTP_SSL_CCC,

                         (long)config->ftp_ssl_ccc_mode);



#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)

        {

          /* TODO: Make this a run-time check instead of compile-time one. */



        /* new in curl 7.19.4 */

        if(config->socks5_gssapi_service)

          my_setopt_str(curl, CURLOPT_SOCKS5_GSSAPI_SERVICE,
@@ -1228,8 +1224,6 @@ static CURLcode operate_do(struct GlobalConfig *global, 
          my_setopt_str(curl, CURLOPT_SERVICE_NAME,

                        config->service_name);



        }

#endif

        /* curl 7.13.0 */

        my_setopt_str(curl, CURLOPT_FTP_ACCOUNT, config->ftp_account);