diff options
Diffstat (limited to 'packages/OS400')
| -rw-r--r-- | packages/OS400/README.OS400 | 4 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 2 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 48 |
3 files changed, 26 insertions, 28 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 8b46b2c99..63e521a2e 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -52,7 +52,7 @@ from CURLOPT_CAINFO. _ The certificate identifier is then used as an application identifier in the main certificate store. If successful, this context is used. _ If the previous step failed, the certificate identifier is used as the file -name of a keyring. CURLOPT_SSLKEYPASSWD is used here as the keyring password. +name of a keyring. CURLOPT_KEYPASSWD is used here as the keyring password. _ The default ca-bundle (CURLOPT_CAINFO) is set to the main certificate store's keyring file name: this allows to use the system global CAs by default. (In that case, the keyring password is safely recovered from the system... IBM dixit!) @@ -78,6 +78,7 @@ options: CURLOPT_FTP_ACCOUNT CURLOPT_FTP_ALTERNATIVE_TO_USER CURLOPT_INTERFACE + CURLOPT_KEYPASSWD CURLOPT_KRBLEVEL CURLOPT_NETRC_FILE CURLOPT_POSTFIELDS @@ -92,7 +93,6 @@ options: CURLOPT_SSLCERTTYPE CURLOPT_SSLENGINE CURLOPT_SSLKEY - CURLOPT_SSLKEYPASSWD CURLOPT_SSLKEYTYPE CURLOPT_SSL_CIPHER_LIST CURLOPT_URL diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c index 978458f59..26d15fa5a 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1039,6 +1039,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_FTP_ACCOUNT: case CURLOPT_FTP_ALTERNATIVE_TO_USER: case CURLOPT_INTERFACE: + case CURLOPT_KEYPASSWD: case CURLOPT_KRBLEVEL: case CURLOPT_NETRC_FILE: case CURLOPT_POSTFIELDS: @@ -1053,7 +1054,6 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_SSLCERTTYPE: case CURLOPT_SSLENGINE: case CURLOPT_SSLKEY: - case CURLOPT_SSLKEYPASSWD: case CURLOPT_SSLKEYTYPE: case CURLOPT_SSL_CIPHER_LIST: case CURLOPT_URL: diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in index 4d84d8616..f57d6f712 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -212,7 +212,7 @@ d c 2 d CURLE_URL_MALFORMAT... d c 3 - d CURLE_URL_MALFORMAT_USER... + d CURLE_OBSOLETE4... d c 4 d CURLE_COULDNT_RESOLVE_PROXY... d c 5 @@ -222,13 +222,13 @@ d c 7 d CURLE_FTP_WEIRD_SERVER_REPLY... d c 8 - d CURLE_FTP_ACCESS_DENIED... + d CURLE_REMOTE_ACCESS_DENIED... d c 9 - d CURLE_FTP_USER_PASSWORD_INCORRECT... + d CURLE_OBSOLETE10... d c 10 d CURLE_FTP_WEIRD_PASS_REPLY... d c 11 - d CURLE_FTP_WEIRD_USER_REPLY... + d CURLE_OBSOLETE12... d c 12 d CURLE_FTP_WEIRD_PASV_REPLY... d c 13 @@ -236,23 +236,23 @@ d c 14 d CURLE_FTP_CANT_GET_HOST... d c 15 - d CURLE_FTP_CANT_RECONNECT... + d CURLE_OBSOLETE16... d c 16 - d CURLE_FTP_COULDNT_SET_BINARY... + d CURLE_FTP_COULDNT_SET_TYPE... d c 17 d CURLE_PARTIAL_FILE... d c 18 d CURLE_FTP_COULDNT_RETR_FILE... d c 19 - d CURLE_FTP_WRITE_ERROR... + d CURLE_OBSOLETE20... d c 20 - d CURLE_FTP_QUOTE_ERROR... + d CURLE_QUOTE_ERROR... d c 21 d CURLE_HTTP_RETURNED_ERROR... d c 22 d CURLE_WRITE_ERROR... d c 23 - d CURLE_MALFORMAT_USER... + d CURLE_OBSOLETE24... d c 24 d CURLE_UPLOAD_FAILED... d c 25 @@ -260,19 +260,17 @@ d c 26 d CURLE_OUT_OF_MEMORY... d c 27 - d CURLE_OPERATION_TIMEOUTED... - d c 28 d CURLE_OPERATION_TIMEDOUT... d c 28 - d CURLE_FTP_COULDNT_SET_ASCII... + d CURLE_OBSOLETE29... d c 29 d CURLE_FTP_PORT_FAILED... d c 30 d CURLE_FTP_COULDNT_USE_REST... d c 31 - d CURLE_FTP_COULDNT_GET_SIZE... + d CURLE_OBSOLETE32... d c 32 - d CURLE_HTTP_RANGE_ERROR... + d CURLE_RANGE_ERROR... d c 33 d CURLE_HTTP_POST_ERROR... d c 34 @@ -286,7 +284,7 @@ d c 38 d CURLE_LDAP_SEARCH_FAILED... d c 39 - d CURLE_LIBRARY_NOT_FOUND... + d CURLE_OBSOLETE40... d c 40 d CURLE_FUNCTION_NOT_FOUND... d c 41 @@ -294,11 +292,11 @@ d c 42 d CURLE_BAD_FUNCTION_ARGUMENT... d c 43 - d CURLE_BAD_CALLING_ORDER... + d CURLE_OBSOLETE44... d c 44 d CURLE_INTERFACE_FAILED... d c 45 - d CURLE_BAD_PASSWORD_ENTERED... + d CURLE_OBSOLETE46... d c 46 d CURLE_TOO_MANY_REDIRECTS... d c 47 @@ -306,7 +304,7 @@ d c 48 d CURLE_TELNET_OPTION_SYNTAX... d c 49 - d CURLE_OBSOLETE... + d CURLE_OBSOLETE50... d c 50 d CURLE_SSL_PEER_CERTIFICATE... d c 51 @@ -320,7 +318,7 @@ d c 55 d CURLE_RECV_ERROR... d c 56 - d CURLE_SHARE_IN_USE... + d CURLE_OBSOLETE57... d c 57 d CURLE_SSL_CERTPROBLEM... d c 58 @@ -346,13 +344,13 @@ d c 68 d CURLE_TFTP_PERM... d c 69 - d CURLE_TFTP_DISKFULL... + d CURLE_REMOTE_DISK_FULL... d c 70 d CURLE_TFTP_ILLEGAL... d c 71 d CURLE_TFTP_UNKNOWNID... d c 72 - d CURLE_TFTP_EXISTS... + d CURLE_REMOTE_FILE_EXISTS... d c 73 d CURLE_TFTP_NOSUCHUSER... d c 74 @@ -493,7 +491,7 @@ d c 10025 d CURLOPT_SSLCERTPASSWD... d c 10026 - d CURLOPT_SSLKEYPASSWD... + d CURLOPT_KEYPASSWD... d c 10026 d CURLOPT_CRLF c 00027 d CURLOPT_QUOTE c 10028 @@ -530,9 +528,9 @@ d CURLOPT_UPLOAD... d c 00046 d CURLOPT_POST c 00047 - d CURLOPT_FTPLISTONLY... + d CURLOPT_DIRLISTONLY... d c 00048 - d CURLOPT_FTPAPPEND... + d CURLOPT_APPEND... d c 00050 d CURLOPT_NETRC c 00051 d CURLOPT_FOLLOWLOCATION... @@ -659,7 +657,7 @@ d c 30117 d CURLOPT_NETRC_FILE... d c 10118 - d CURLOPT_FTP_SSL... + d CURLOPT_USE_SSL... d c 00119 d CURLOPT_POSTFIELDSIZE_LARGE... d c 30120 |