Commit a49d2d0e authored by Jay Satiro's avatar Jay Satiro
Browse files

OS400: Fix symbols 

- s/CURLOPT_SOCKS_PROXY/CURLOPT_PRE_PROXY
  Follow-up to 7907a2be and 845522ca.

- Fix incorrect id for CURLOPT_PROXY_PINNEDPUBLICKEY.

- Add id for CURLOPT_ABSTRACT_UNIX_SOCKET.

Bug: https://github.com/curl/curl/issues/1237


Reported-by: default avatar <jonrumsey@users.noreply.github.com>
parent 1c877a07

packages/OS400/README.OS400

+2 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ designer. CCSID 0 can be used to select the current job's CCSID. 
_ curl_easy_setopt_ccsid()

  Variable arguments are a string pointer and a CCSID (unsigned int) for

options:

        CURLOPT_ABSTRACT_UNIX_SOCKET

        CURLOPT_CAINFO

        CURLOPT_CAPATH

        CURLOPT_COOKIE
@@ -90,6 +91,7 @@ options: 
        CURLOPT_NOPROXY

        CURLOPT_PASSWORD

        CURLOPT_PINNEDPUBLICKEY

        CURLOPT_PRE_PROXY

        CURLOPT_PROXY

        CURLOPT_PROXYPASSWORD

        CURLOPT_PROXYUSERNAME
@@ -116,7 +118,6 @@ options: 
        CURLOPT_RTSP_TRANSPORT

        CURLOPT_SERVICE_NAME

        CURLOPT_SOCKS5_GSSAPI_SERVICE

        CURLOPT_SOCKS_PROXY

        CURLOPT_SSH_HOST_PUBLIC_KEY_MD5

        CURLOPT_SSH_KNOWNHOSTS

        CURLOPT_SSH_PRIVATE_KEYFILE

packages/OS400/ccsidcurl.c

+2 −1
Original line number Diff line number Diff line
@@ -1135,6 +1135,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 


  switch (tag) {



  case CURLOPT_ABSTRACT_UNIX_SOCKET:

  case CURLOPT_CAINFO:

  case CURLOPT_CAPATH:

  case CURLOPT_COOKIE:
@@ -1161,6 +1162,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 
  case CURLOPT_NOPROXY:

  case CURLOPT_PASSWORD:

  case CURLOPT_PINNEDPUBLICKEY:

  case CURLOPT_PRE_PROXY:

  case CURLOPT_PROXY:

  case CURLOPT_PROXYPASSWORD:

  case CURLOPT_PROXYUSERNAME:
@@ -1187,7 +1189,6 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) 
  case CURLOPT_RTSP_TRANSPORT:

  case CURLOPT_SERVICE_NAME:

  case CURLOPT_SOCKS5_GSSAPI_SERVICE:

  case CURLOPT_SOCKS_PROXY:

  case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5:

  case CURLOPT_SSH_KNOWNHOSTS:

  case CURLOPT_SSH_PRIVATE_KEYFILE:

packages/OS400/curl.inc.in

+3 −3
Original line number Diff line number Diff line
@@ -1294,11 +1294,11 @@ 
     d                 c                   10260

     d  CURLOPT_PROXY_SSL_OPTIONS...

     d                 c                   00261

     d  CURLOPT_SOCKS_PROXY...

     d  CURLOPT_PRE_PROXY...

     d                 c                   10262

     d  CURLOPT_SOCKS_PROXYTYPE...

     d                 c                   00263

     d  CURLOPT_PROXY_PINNEDPUBLICKEY...

     d                 c                   10263

     d  CURLOPT_ABSTRACT_UNIX_SOCKET...

     d                 c                   10264

      *

      /if not defined(CURL_NO_OLDIES)

src/tool_setopt.h

+0 −1
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ extern const NameValueUnsigned setopt_nv_CURLAUTH[]; 
#define setopt_nv_CURLOPT_PROTOCOLS setopt_nv_CURLPROTO

#define setopt_nv_CURLOPT_REDIR_PROTOCOLS setopt_nv_CURLPROTO

#define setopt_nv_CURLOPT_PROXYTYPE setopt_nv_CURLPROXY

#define setopt_nv_CURLOPT_SOCKS_PROXYTYPE setopt_nv_CURL_SOCKS_PROXY

#define setopt_nv_CURLOPT_PROXYAUTH setopt_nv_CURLAUTH



/* Intercept setopt calls for --libcurl */