- Take new char * options into account in OS400 curl_easy_setopt_ccsid().

- Keep RPG binding, STRING_* table end check and OS400 README up to date.

diff --git a/packages/OS400/README.OS400 b/packages/OS400/README.OS400
index 746bba8a537a27285689e6a5f9c1a646a695b44e..0cd5633aac06be0d90150c2f6fb5994895c16698 100644 (file)
--- a/packages/OS400/README.OS400
+++ b/packages/OS400/README.OS400
@@ -110,6 +110,9 @@ options:
         CURLOPT_RTSP_TRANSPORT
         CURLOPT_SOCKS5_GSSAPI_SERVICE
         CURLOPT_MAIL_FROM
+        CURLOPT_TLSAUTH_USERNAME
+        CURLOPT_TLSAUTH_PASSWORD
+        CURLOPT_TLSAUTH_TYPE
   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 ad67e1c87b80bdd61315e940f2edb16a97b25565..f7bb98ee20ad11ebaa0671622de6594dbab00794 100644 (file)
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -1029,7 +1029,11 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
   if (testwarn) {
     testwarn = 0;
 
+#ifdef USE_TLS_SRP
+    if ((int) STRING_LAST != (int) STRING_TLSAUTH_PASSWORD + 1)
+#else
     if ((int) STRING_LAST != (int) STRING_MAIL_FROM + 1)
+#endif
       curl_mfprintf(stderr,
        "*** WARNING: curl_easy_setopt_ccsid() should be reworked ***\n");
     }
@@ -1086,6 +1090,11 @@ curl_easy_setopt_ccsid(CURL * curl, CURLoption tag, ...)
   /* 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
     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 d94c27264b7990445563c7a2c54c205b659d1db3..0274f369abad153c05a974011296ae51c8cbd22f 100644 (file)
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -474,8 +474,6 @@
      d                 c                   87
      d  CURLE_CHUNK_FAILED...
      d                 c                   88
-     d  CURLE_TLSAUTH_FAILED...
-     d                 c                   89
       *
      d curlioerr       s             10i 0 based(######ptr######)               Enum
      d  CURLIOE_OK     c                   0
@@ -1279,6 +1277,13 @@
      d  CURLSOCKTYPE_IPCXN...
      d                 c                   0
       *
+     d  CURL_SOCKOPT_OK...
+     d                 c                   0
+     d  CURL_SOCKOPT_ERROR...
+     d                 c                   1
+     d  CURL_SOCKOPT_ALREADY_CONNECTED...
+     d                 c                   2
+      *
      d CURLMcode       s             10i 0 based(######ptr######)               Enum
      d  CURLM_CALL_MULTI_PERFORM...
      d                 c                   -1