[gnurl] 70/264: OS400: Update strings for ccsid-ifier

[gnunet]

This is an automated email from the git hooks/post-receive script.

nikita pushed a commit to branch master
in repository gnurl.

commit a08425444b079f148ae2a4d2ae70dd3cd58b44db
Author: Calvin Buckley <address@hidden>
AuthorDate: Sat Mar 21 19:54:16 2020 +0100

    OS400: Update strings for ccsid-ifier
    
    Fixes build.
    
    Closes #5132
---
 packages/OS400/ccsidcurl.c  |  5 ++++-
 packages/OS400/chkstrings.c | 10 +++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/OS400/ccsidcurl.c b/packages/OS400/ccsidcurl.c
index 64fb7393d..4e04927b0 100644
--- a/packages/OS400/ccsidcurl.c
+++ b/packages/OS400/ccsidcurl.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2019, Daniel Stenberg, <address@hidden>, et al.
+ * Copyright (C) 1998 - 2020, Daniel Stenberg, <address@hidden>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -1148,6 +1148,9 @@ curl_easy_setopt_ccsid(CURL *curl, CURLoption tag, ...)
   case CURLOPT_CUSTOMREQUEST:
   case CURLOPT_DEFAULT_PROTOCOL:
   case CURLOPT_DNS_SERVERS:
+  case CURLOPT_DNS_INTERFACE:
+  case CURLOPT_DNS_LOCAL_IP4:
+  case CURLOPT_DNS_LOCAL_IP6:
   case CURLOPT_DOH_URL:
   case CURLOPT_EGDSOCKET:
   case CURLOPT_ENCODING:
diff --git a/packages/OS400/chkstrings.c b/packages/OS400/chkstrings.c
index 613540e42..083263640 100644
--- a/packages/OS400/chkstrings.c
+++ b/packages/OS400/chkstrings.c
@@ -28,13 +28,13 @@
 /* The following defines indicate the expected dupstring enum values
  * in curl_easy_setopt_ccsid() in packages/OS400/ccsidcurl.c. If a
  * mismatch is flagged during the build, it indicates that 
curl_easy_setopt_ccsid()
- * may need updating to perform data EBCDIC to ASCII data conversion on 
+ * may need updating to perform data EBCDIC to ASCII data conversion on
  * the string.
  * Once any applicable changes to curl_easy_setopt_ccsid() have been
  * made, the EXPECTED_STRING_LASTZEROTERMINATED/EXPECTED_STRING_LAST
  * values can be updated to match the latest enum values in urldata.h.
  */
-#define EXPECTED_STRING_LASTZEROTERMINATED  (STRING_TEMP_URL + 1)
+#define EXPECTED_STRING_LASTZEROTERMINATED  (STRING_DNS_LOCAL_IP6 + 1)
 #define EXPECTED_STRING_LAST                (STRING_COPYPOSTFIELDS + 1)
 
 int main(int argc, char *argv[])
@@ -43,13 +43,13 @@ int main(int argc, char *argv[])
 
   if (STRING_LASTZEROTERMINATED != EXPECTED_STRING_LASTZEROTERMINATED)
   {
-    fprintf(stderr,"STRING_LASTZEROTERMINATED(%d) is not expected 
value(%d).\n", 
+    fprintf(stderr,"STRING_LASTZEROTERMINATED(%d) is not expected 
value(%d).\n",
             STRING_LASTZEROTERMINATED, EXPECTED_STRING_LASTZEROTERMINATED);
     rc += 1;
   }
   if (STRING_LAST != EXPECTED_STRING_LAST)
   {
-    fprintf(stderr,"STRING_LAST(%d) is not expected value(%d).\n", 
+    fprintf(stderr,"STRING_LAST(%d) is not expected value(%d).\n",
             STRING_LAST, EXPECTED_STRING_LAST);
     rc += 2;
   }
@@ -59,4 +59,4 @@ int main(int argc, char *argv[])
             " may need updating if new strings are provided as input via the 
curl API.\n");
   }
   return rc;
-}
\ No newline at end of file
+}

-- 
To stop receiving notification emails like this one, please contact
address@hidden.