diff options
| -rw-r--r-- | packages/OS400/README.OS400 | 43 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 41 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 15 |
3 files changed, 56 insertions, 43 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 0dba7654a..8e2dc7f45 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -70,49 +70,50 @@ options: CURLOPT_COOKIEFILE CURLOPT_COOKIEJAR CURLOPT_COOKIELIST + CURLOPT_COPYPOSTFIELDS + CURLOPT_CRLFILE CURLOPT_CUSTOMREQUEST CURLOPT_EGDSOCKET CURLOPT_ENCODING - CURLOPT_FTPPORT CURLOPT_FTP_ACCOUNT CURLOPT_FTP_ALTERNATIVE_TO_USER + CURLOPT_FTPPORT CURLOPT_INTERFACE + CURLOPT_ISSUERCERT CURLOPT_KEYPASSWD CURLOPT_KRBLEVEL + CURLOPT_MAIL_FROM CURLOPT_NETRC_FILE - CURLOPT_COPYPOSTFIELDS + CURLOPT_NOPROXY + CURLOPT_PASSWORD CURLOPT_PROXY + CURLOPT_PROXYPASSWORD + CURLOPT_PROXYUSERNAME CURLOPT_PROXYUSERPWD CURLOPT_RANDOM_FILE CURLOPT_RANGE CURLOPT_REFERER - CURLOPT_SSH_PRIVATE_KEYFILE - CURLOPT_SSH_PUBLIC_KEYFILE + CURLOPT_RTSP_SESSION_UID + CURLOPT_RTSP_STREAM_URI + CURLOPT_RTSP_TRANSPORT + CURLOPT_SOCKS5_GSSAPI_SERVICE + CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 Note: SSH not available on OS400. + CURLOPT_SSH_KNOWNHOSTS Note: SSH not available on OS400. + CURLOPT_SSH_PRIVATE_KEYFILE Note: SSH not available on OS400. + CURLOPT_SSH_PUBLIC_KEYFILE Note: SSH not available on OS400. CURLOPT_SSLCERT CURLOPT_SSLCERTTYPE + CURLOPT_SSL_CIPHER_LIST CURLOPT_SSLENGINE CURLOPT_SSLKEY CURLOPT_SSLKEYTYPE - CURLOPT_SSL_CIPHER_LIST + CURLOPT_TLSAUTH_PASSWORD + CURLOPT_TLSAUTH_TYPE + CURLOPT_TLSAUTH_USERNAME CURLOPT_URL CURLOPT_USERAGENT - CURLOPT_USERPWD - CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 - CURLOPT_CRLFILE - CURLOPT_ISSUERCERT CURLOPT_USERNAME - CURLOPT_PASSWORD - CURLOPT_PROXYUSERNAME - CURLOPT_PROXYPASSWORD - CURLOPT_NOPROXY - CURLOPT_RTSP_SESSION_UID - CURLOPT_RTSP_STREAM_URI - CURLOPT_RTSP_TRANSPORT - CURLOPT_SOCKS5_GSSAPI_SERVICE - CURLOPT_MAIL_FROM - CURLOPT_TLSAUTH_USERNAME - CURLOPT_TLSAUTH_PASSWORD - CURLOPT_TLSAUTH_TYPE + CURLOPT_USERPWD Else it is the same as for curl_easy_setopt(). Note that CURLOPT_ERRORBUFFER is not in the list above, since it gives the address of an (empty) character buffer, not the address of a string. diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index f7bb98ee2..2943ba62f 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1049,52 +1049,49 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_COOKIEFILE: case CURLOPT_COOKIEJAR: case CURLOPT_COOKIELIST: + case CURLOPT_CRLFILE: case CURLOPT_CUSTOMREQUEST: case CURLOPT_EGDSOCKET: case CURLOPT_ENCODING: - case CURLOPT_FTPPORT: case CURLOPT_FTP_ACCOUNT: case CURLOPT_FTP_ALTERNATIVE_TO_USER: + case CURLOPT_FTPPORT: case CURLOPT_INTERFACE: + case CURLOPT_ISSUERCERT: case CURLOPT_KEYPASSWD: case CURLOPT_KRBLEVEL: + case CURLOPT_MAIL_FROM: case CURLOPT_NETRC_FILE: + case CURLOPT_NOPROXY: + case CURLOPT_PASSWORD: case CURLOPT_PROXY: + case CURLOPT_PROXYPASSWORD: + case CURLOPT_PROXYUSERNAME: case CURLOPT_PROXYUSERPWD: case CURLOPT_RANDOM_FILE: case CURLOPT_RANGE: case CURLOPT_REFERER: + case CURLOPT_RTSP_SESSION_ID: + case CURLOPT_RTSP_STREAM_URI: + case CURLOPT_RTSP_TRANSPORT: + case CURLOPT_SOCKS5_GSSAPI_SERVICE: + case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: + case CURLOPT_SSH_KNOWNHOSTS: case CURLOPT_SSH_PRIVATE_KEYFILE: case CURLOPT_SSH_PUBLIC_KEYFILE: case CURLOPT_SSLCERT: case CURLOPT_SSLCERTTYPE: + case CURLOPT_SSL_CIPHER_LIST: case CURLOPT_SSLENGINE: case CURLOPT_SSLKEY: case CURLOPT_SSLKEYTYPE: - case CURLOPT_SSL_CIPHER_LIST: + case CURLOPT_TLSAUTH_PASSWORD: + case CURLOPT_TLSAUTH_TYPE: + case CURLOPT_TLSAUTH_USERNAME: case CURLOPT_URL: case CURLOPT_USERAGENT: - case CURLOPT_USERPWD: - case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: - case CURLOPT_CRLFILE: - case CURLOPT_ISSUERCERT: case CURLOPT_USERNAME: - case CURLOPT_PASSWORD: - case CURLOPT_PROXYUSERNAME: - case CURLOPT_PROXYPASSWORD: - case CURLOPT_NOPROXY: - case CURLOPT_RTSP_SESSION_ID: - case CURLOPT_RTSP_STREAM_URI: - case CURLOPT_RTSP_TRANSPORT: - /* SSH2 not (yet) implemented on OS400. */ - /* case CURLOPT_SSH_KNOWNHOSTS: */ - case CURLOPT_SOCKS5_GSSAPI_SERVICE: - case CURLOPT_MAIL_FROM: -#ifdef USE_TLS_SRP - case CURLOPT_TLSAUTH_USERNAME: - case CURLOPT_TLSAUTH_PASSWORD: - case CURLOPT_TLSAUTH_TYPE: -#endif + case CURLOPT_USERPWD: s = va_arg(arg, char *); ccsid = va_arg(arg, unsigned int); diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index ce70ba471..836c83db3 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -111,6 +111,8 @@ d c X'00002000' d CURL_VERSION_TLSAUTH_SRP... d c X'00004000' + d CURL_VERSION_NTLM_WB... + d c X'00008000' * d HTTPPOST_FILENAME... d c X'00000001' @@ -151,6 +153,8 @@ d CURLAUTH_NTLM c X'00000008' d CURLAUTH_DIGEST_IE... d c X'00000010' + d CURLAUTH_NTLM_WB... + d c X'00000020' d CURLAUTH_ONLY... d c X'80000000' d CURLAUTH_ANY c X'7FFFFFEF' @@ -172,6 +176,13 @@ d CURLSSH_AUTH_DEFAULT... d c X'7FFFFFFF' CURLSSH_AUTH_ANY * + d CURLGSSAPI_DELEGATION_NONE... + d c 0 + d CURLGSSAPI_DELEGATION_POLICY_FLAG... + d c X'00000001' + d CURLGSSAPI_DELEGATION_FLAG... + d c X'00000002' + * d CURL_ERROR_SIZE... d c 256 * @@ -1111,6 +1122,8 @@ d c 20208 d CURLOPT_CLOSESOCKETDATA... d c 10209 + d CURLOPT_GSSAPI_DELEGATION... + d c 00210 * /if not defined(CURL_NO_OLDIES) d CURLOPT_SSLKEYPASSWD... @@ -1341,6 +1354,8 @@ d c 3 d CURLSHE_NOMEM... d c 4 + d CURLSHE_NOT_BUILT_IN... + d c 5 * d CURLSHoption... d s 10i 0 based(######ptr######) Enum |