diff options
| author | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2007-10-03 15:09:21 +0000 |
|---|---|---|
| committer | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2007-10-03 15:09:21 +0000 |
| commit | 43b10339abc7bed4c199e91e08ccdc5839416767 (patch) | |
| tree | 11c9736539286d6a91f5753c6fbcd5035d41d54f | |
| parent | 3f3a38f9c6cd87b767d2a9e1f713ac975bda5f80 (diff) | |
Upgrade OS400 wrappers and RPG copy file according to latest code updates
| -rw-r--r-- | packages/OS400/README.OS400 | 1 | ||||
| -rw-r--r-- | packages/OS400/ccsidcurl.c | 3 | ||||
| -rw-r--r-- | packages/OS400/curl.inc.in | 19 |
3 files changed, 21 insertions, 2 deletions
diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400 index 63e521a2e..eb5b940ac 100644 --- a/packages/OS400/README.OS400 +++ b/packages/OS400/README.OS400 @@ -98,6 +98,7 @@ options: CURLOPT_URL CURLOPT_USERAGENT CURLOPT_USERPWD + CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 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 26d15fa5a..ad8f0fa7c 100644 --- a/packages/OS400/ccsidcurl.c +++ b/packages/OS400/ccsidcurl.c @@ -1016,7 +1016,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) if (testwarn) { testwarn = 0; - if ((int) STRING_LAST != (int) STRING_USERPWD + 1) + if ((int) STRING_LAST != (int) STRING_SSH_HOST_PUBLIC_KEY_MD5 + 1) curl_mfprintf(stderr, "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n"); } @@ -1059,6 +1059,7 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...) case CURLOPT_URL: case CURLOPT_USERAGENT: case CURLOPT_USERPWD: + case CURLOPT_SSH_HOST_PUBLIC_KEY_MD5: 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 2fc531211..aad62ecd4 100644 --- a/packages/OS400/curl.inc.in +++ b/packages/OS400/curl.inc.in @@ -306,7 +306,7 @@ d c 49 d CURLE_OBSOLETE50... d c 50 - d CURLE_SSL_PEER_CERTIFICATE... + d CURLE_PEER_FAILED_VERIFICATION... d c 51 d CURLE_GOT_NOTHING... d c 52 @@ -725,6 +725,12 @@ d c 00160 d CURLOPT_POST301... d c 00161 + d CURLOPT_SSH_HOST_PUBLIC_KEY_MD5... + d c 10162 + d CURLOPT_OPENSOCKETFUNCTION... + d c 20163 + d CURLOPT_OPENSOCKETDATA... + d c 10164 * d CURLFORMcode s 10i 0 based(######ptr######) Enum d CURL_FORMADD_OK... @@ -1004,6 +1010,14 @@ d flags 10i 0 long d showfilename * char * * + d curl_sockaddr ds based(######ptr######) + d qualified + d family 10i 0 + d socktype 10i 0 + d protocol 10i 0 + d addrlen 10i 0 socklen_t + d addr 16 struct sockaddr + * d curl_forms ds based(######ptr######) d qualified d option like(CURLformoption) @@ -1086,6 +1100,9 @@ d curl_socket_callback... d s * based(######ptr######) procptr * + d curl_opensocket_callback... + d s * based(######ptr######) procptr + * ************************************************************************** * Prototypes ************************************************************************** |