aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/OS400/curl.inc.in98
-rw-r--r--packages/OS400/os400sys.c5
2 files changed, 96 insertions, 7 deletions
diff --git a/packages/OS400/curl.inc.in b/packages/OS400/curl.inc.in
index 0274f369a..65c1e72be 100644
--- a/packages/OS400/curl.inc.in
+++ b/packages/OS400/curl.inc.in
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -304,7 +304,7 @@
d c 2
d CURLE_URL_MALFORMAT...
d c 3
- d CURLE_OBSOLETE4...
+ d CURLE_NOT_BUILT_IN...
d c 4
d CURLE_COULDNT_RESOLVE_PROXY...
d c 5
@@ -392,7 +392,7 @@
d c 46
d CURLE_TOO_MANY_REDIRECTS...
d c 47
- d CURLE_UNKNOWN_TELNET_OPTION...
+ d CURLE_UNKNOWN_OPTION...
d c 48
d CURLE_TELNET_OPTION_SYNTAX...
d c 49
@@ -475,6 +475,67 @@
d CURLE_CHUNK_FAILED...
d c 88
*
+ /if not defined(CURL_NO_OLDIES)
+ d CURLE_URL_MALFORMAT_USER...
+ d c 4
+ d CURLE_FTP_ACCESS_DENIED...
+ d c 9
+ d CURLE_FTP_USER_PASSWORD_INCORRECT...
+ d c 10
+ d CURLE_FTP_WEIRD_USER_REPLY...
+ d c 12
+ d CURLE_FTP_CANT_RECONNECT...
+ d c 16
+ d CURLE_FTP_COULDNT_SET_BINARY...
+ d c 17
+ d CURLE_FTP_PARTIAL_FILE...
+ d c 18
+ d CURLE_FTP_WRITE_ERROR...
+ d c 20
+ d CURLE_FTP_QUOTE_ERROR...
+ d c 21
+ d CURLE_HTTP_NOT_FOUND...
+ d c 22
+ d CURLE_MALFORMAT_USER...
+ d c 24
+ d CURLE_FTP_COULDNT_STOR_FILE...
+ d c 25
+ d CURLE_OPERATION_TIMEOUTED...
+ d c 28
+ d CURLE_FTP_COULDNT_SET_ASCII...
+ d c 29
+ d CURLE_FTP_COULDNT_GET_SIZE...
+ d c 32
+ d CURLE_HTTP_RANGE_ERROR...
+ d c 33
+ d CURLE_FTP_BAD_DOWNLOAD_RESUME...
+ d c 36
+ d CURLE_LIBRARY_NOT_FOUND...
+ d c 40
+ d CURLE_BAD_CALLING_ORDER...
+ d c 44
+ d CURLE_HTTP_PORT_FAILED...
+ d c 45
+ d CURLE_BAD_PASSWORD_ENTERED...
+ d c 46
+ d CURLE_UNKNOWN_TELNET_OPTION...
+ d c 48
+ d CURLE_OBSOLETE...
+ d c 50
+ d CURLE_SSL_PEER_CERTIFICATE...
+ d c 51
+ d CURLE_SHARE_IN_USE...
+ d c 57
+ d CURLE_FTP_SSL_FAILED...
+ d c 64
+ d CURLE_TFTP_DISKFULL...
+ d c 70
+ d CURLE_TFTP_EXISTS...
+ d c 73
+ d CURLE_ALREADY_COMPLETE...
+ d c 99999
+ /endif
+ *
d curlioerr s 10i 0 based(######ptr######) Enum
d CURLIOE_OK c 0
d CURLIOE_UNKNOWNCMD...
@@ -569,6 +630,19 @@
d CURLUSESSL_ALL...
d c 3
*
+ /if not defined(CURL_NO_OLDIES)
+ d curl_ftpssl s like(curl_usessl)
+ d based(######ptr######)
+ d CURLFTPSSL_NONE...
+ d c 0
+ d CURLFTPSSL_TRY...
+ d c 1
+ d CURLFTPSSL_CONTROL...
+ d c 2
+ d CURLFTPSSL_ALL...
+ d c 3
+ /endif
+ *
d curl_ftpccc s 10i 0 based(######ptr######) Enum
d CURLFTPSSL_CCC_NONE...
d c 0
@@ -707,8 +781,6 @@
d c 10024
d CURLOPT_SSLCERT...
d c 10025
- d CURLOPT_SSLCERTPASSWD...
- d c 10026
d CURLOPT_KEYPASSWD...
d c 10026
d CURLOPT_CRLF c 00027
@@ -1034,10 +1106,24 @@
d CURLOPT_TLSAUTH_TYPE...
d c 10206
*
+ /if not defined(CURL_NO_OLDIES)
+ d CURLOPT_SSLKEYPASSWD...
+ d c 10026
+ d CURLOPT_SSLCERTPASSWD...
+ d c 10026
+ d CURLOPT_FTPLISTONLY...
+ d c 00048
+ d CURLOPT_FTPAPPEND...
+ d c 00050
+ d CURLOPT_KRB4LEVEL...
+ d c 10063
d CURLOPT_SERVER_RESPONSE_TIMEOUT...
d c 00112
+ d CURLOPT_FTP_SSL...
+ d c 00119
d CURLOPT_POST301...
- d c 00161 Obsolescent
+ d c 00161
+ /endif
*
d CURLFORMcode s 10i 0 based(######ptr######) Enum
d CURL_FORMADD_OK...
diff --git a/packages/OS400/os400sys.c b/packages/OS400/os400sys.c
index 071fa482d..5527ce720 100644
--- a/packages/OS400/os400sys.c
+++ b/packages/OS400/os400sys.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
@@ -863,6 +863,7 @@ Curl_ldap_get_dn_a(void * ld, LDAPMessage * entry)
return cp2;
QadrtConvertE2A(cp2, cp, i, i);
+ cp2[i] = '\0';
/* No way to allocate a buffer here, because it will be released by
ldap_memfree() and ldap_memalloc() does not exist. The solution is to
@@ -894,6 +895,7 @@ Curl_ldap_first_attribute_a(void * ld,
return cp2;
QadrtConvertE2A(cp2, cp, i, i);
+ cp2[i] = '\0';
/* No way to allocate a buffer here, because it will be released by
ldap_memfree() and ldap_memalloc() does not exist. The solution is to
@@ -925,6 +927,7 @@ Curl_ldap_next_attribute_a(void * ld,
return cp2;
QadrtConvertE2A(cp2, cp, i, i);
+ cp2[i] = '\0';
/* No way to allocate a buffer here, because it will be released by
ldap_memfree() and ldap_memalloc() does not exist. The solution is to