mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2024-12-09 06:30:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

English: use American spelling consistently

Browse Source 
Authorization, Initialization, Organization etc.

Closes #8673
This commit is contained in:
Daniel Stenberg 2022-04-05 13:32:26 +02:00
parent b47bda5594
commit 4a8f6869db
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
23 changed files with 38 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/URL-SYNTAX.md
View File

@ -317,13 +317,13 @@ Name, Attributes, Scope, Filter and Extension for a LDAP search. Each field is
separated by a question mark and when that field is not required an empty separated by a question mark and when that field is not required an empty
string with the question mark separator should be included. string with the question mark separator should be included.
Search for the DN as `My Organisation`: Search for the DN as `My Organization`:
ldap://ldap.example.com/o=My%20Organisation ldap://ldap.example.com/o=My%20Organization
the same search but will only return postalAddress attributes: the same search but will only return postalAddress attributes:
ldap://ldap.example.com/o=My%20Organisation?postalAddress ldap://ldap.example.com/o=My%20Organization?postalAddress
Search for an empty DN and request information about the Search for an empty DN and request information about the
`rootDomainNamingContext` attribute for an Active Directory server: `rootDomainNamingContext` attribute for an Active Directory server:

2
docs/cmdline-opts/sasl-authzid.d
View File

@ -6,7 +6,7 @@ Category: auth
Example: --sasl-authzid zid imap://example.com/ Example: --sasl-authzid zid imap://example.com/
See-also: login-options See-also: login-options
--- ---
Use this authorisation identity (authzid), during SASL PLAIN authentication, Use this authorization identity (authzid), during SASL PLAIN authentication,
in addition to the authentication identity (authcid) as specified by --user. in addition to the authentication identity (authcid) as specified by --user.
If the option is not specified, the server will derive the authzid from the If the option is not specified, the server will derive the authzid from the

4
docs/examples/curlx.c
View File

@ -3,7 +3,7 @@
This is a little program to demonstrate the usage of This is a little program to demonstrate the usage of
- an ssl initialisation callback setting a user key and trustbases - an SSL initialization callback setting a user key and trustbases
coming from a pkcs12 file coming from a pkcs12 file
- using an ssl application callback to find a URI in the - using an ssl application callback to find a URI in the
certificate presented during ssl session establishment. certificate presented during ssl session establishment.
@ -228,7 +228,7 @@ static int ssl_app_verify_callback(X509_STORE_CTX *ctx, void *arg)
} }
/* The SSL initialisation callback. The callback sets: /* The SSL initialization callback. The callback sets:
- a private key and certificate - a private key and certificate
- a trusted ca certificate - a trusted ca certificate
- a preferred cipherlist - a preferred cipherlist

4
docs/examples/imap-authzid.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -45,7 +45,7 @@ int main(void)
curl_easy_setopt(curl, CURLOPT_USERNAME, "user"); curl_easy_setopt(curl, CURLOPT_USERNAME, "user");
curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret"); curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret");
/* Set the authorisation identity (identity to act as) */ /* Set the authorization identity (identity to act as) */
curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "shared-mailbox"); curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "shared-mailbox");
/* Force PLAIN authentication */ /* Force PLAIN authentication */

4
docs/examples/pop3-authzid.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -45,7 +45,7 @@ int main(void)
curl_easy_setopt(curl, CURLOPT_USERNAME, "user"); curl_easy_setopt(curl, CURLOPT_USERNAME, "user");
curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret"); curl_easy_setopt(curl, CURLOPT_PASSWORD, "secret");
/* Set the authorisation identity (identity to act as) */ /* Set the authorization identity (identity to act as) */
curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "shared-mailbox"); curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "shared-mailbox");
/* Force PLAIN authentication */ /* Force PLAIN authentication */

4
docs/examples/smtp-authzid.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -107,7 +107,7 @@ int main(void)
curl_easy_setopt(curl, CURLOPT_USERNAME, "kurt"); curl_easy_setopt(curl, CURLOPT_USERNAME, "kurt");
curl_easy_setopt(curl, CURLOPT_PASSWORD, "xipj3plmq"); curl_easy_setopt(curl, CURLOPT_PASSWORD, "xipj3plmq");
/* Set the authorisation identity (identity to act as) */ /* Set the authorization identity (identity to act as) */
curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "ursel"); curl_easy_setopt(curl, CURLOPT_SASL_AUTHZID, "ursel");
/* Force PLAIN authentication */ /* Force PLAIN authentication */

4
docs/examples/synctime.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -39,7 +39,7 @@
* *
* Synchronising your computer clock via Internet time server usually relies * Synchronising your computer clock via Internet time server usually relies
* on DAYTIME, TIME, or NTP protocols. These protocols provide good accurate * on DAYTIME, TIME, or NTP protocols. These protocols provide good accurate
* time synchronisation but it does not work very well through a * time synchronization but it does not work very well through a
* firewall/proxy. Some adjustment has to be made to the firewall/proxy for * firewall/proxy. Some adjustment has to be made to the firewall/proxy for
* these protocols to work properly. * these protocols to work properly.
* *

4
docs/libcurl/curl_easy_setopt.3
View File

@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___ .\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____| .\" * \___|\___/|_| \_\_____|
.\" * .\" *
.\" * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
.\" * .\" *
.\" * This software is licensed as described in the file COPYING, which .\" * This software is licensed as described in the file COPYING, which
.\" * you should have received as part of this distribution. The terms .\" * you should have received as part of this distribution. The terms
@ -264,7 +264,7 @@ Proxy TLS authentication methods. See \fICURLOPT_PROXY_TLSAUTH_TYPE(3)\fP
.IP CURLOPT_PROXYAUTH .IP CURLOPT_PROXYAUTH
HTTP proxy authentication methods. See \fICURLOPT_PROXYAUTH(3)\fP HTTP proxy authentication methods. See \fICURLOPT_PROXYAUTH(3)\fP
.IP CURLOPT_SASL_AUTHZID .IP CURLOPT_SASL_AUTHZID
SASL authorisation identity (identity to act as). See \fICURLOPT_SASL_AUTHZID(3)\fP SASL authorization identity (identity to act as). See \fICURLOPT_SASL_AUTHZID(3)\fP
.IP CURLOPT_SASL_IR .IP CURLOPT_SASL_IR
Enable SASL initial response. See \fICURLOPT_SASL_IR(3)\fP Enable SASL initial response. See \fICURLOPT_SASL_IR(3)\fP
.IP CURLOPT_XOAUTH2_BEARER .IP CURLOPT_XOAUTH2_BEARER

4
docs/libcurl/curl_global_init.3
View File

@ -5,7 +5,7 @@
.\" * | (__| |_| | _ <| |___ .\" * | (__| |_| | _ <| |___
.\" * \___|\___/|_| \_\_____| .\" * \___|\___/|_| \_\_____|
.\" * .\" *
.\" * Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. .\" * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
.\" * .\" *
.\" * This software is licensed as described in the file COPYING, which .\" * This software is licensed as described in the file COPYING, which
.\" * you should have received as part of this distribution. The terms .\" * you should have received as part of this distribution. The terms
@ -21,7 +21,7 @@
.\" ************************************************************************** .\" **************************************************************************
.TH curl_global_init 3 "11 May 2004" "libcurl 7.12" "libcurl Manual" .TH curl_global_init 3 "11 May 2004" "libcurl 7.12" "libcurl Manual"
.SH NAME .SH NAME
curl_global_init - Global libcurl initialisation curl_global_init - Global libcurl initialization
.SH SYNOPSIS .SH SYNOPSIS
.nf .nf
#include <curl/curl.h> #include <curl/curl.h>

2
docs/libcurl/curl_global_init_mem.3
View File

@ -21,7 +21,7 @@
.\" ************************************************************************** .\" **************************************************************************
.TH curl_global_init_mem 3 "10 May 2004" "libcurl 7.12.0" "libcurl Manual" .TH curl_global_init_mem 3 "10 May 2004" "libcurl 7.12.0" "libcurl Manual"
.SH NAME .SH NAME
curl_global_init_mem - Global libcurl initialisation with memory callbacks curl_global_init_mem - Global libcurl initialization with memory callbacks
.SH SYNOPSIS .SH SYNOPSIS
.nf .nf
#include <curl/curl.h> #include <curl/curl.h>

4
docs/libcurl/opts/CURLOPT_SASL_AUTHZID.3
View File

@ -22,7 +22,7 @@
.\" .\"
.TH CURLOPT_SASL_AUTHZID 3 "11 Sep 2019" "libcurl 7.66.0" "curl_easy_setopt options" .TH CURLOPT_SASL_AUTHZID 3 "11 Sep 2019" "libcurl 7.66.0" "curl_easy_setopt options"
.SH NAME .SH NAME
CURLOPT_SASL_AUTHZID \- authorisation identity (identity to act as) CURLOPT_SASL_AUTHZID \- authorization identity (identity to act as)
.SH SYNOPSIS .SH SYNOPSIS
.nf .nf
#include <curl/curl.h> #include <curl/curl.h>
@ -31,7 +31,7 @@ CURLcode curl_easy_setopt(CURL *handle, CURLOPT_SASL_AUTHZID, char *authzid);
.fi .fi
.SH DESCRIPTION .SH DESCRIPTION
Pass a char * as parameter, which should be pointing to the null-terminated Pass a char * as parameter, which should be pointing to the null-terminated
authorisation identity (authzid) for the transfer. Only applicable to the PLAIN authorization identity (authzid) for the transfer. Only applicable to the PLAIN
SASL authentication mechanism where it is optional. SASL authentication mechanism where it is optional.
When not specified only the authentication identity (authcid) as specified by When not specified only the authentication identity (authcid) as specified by

2
include/curl/curl.h
View File

@ -2049,7 +2049,7 @@ typedef enum {
* (in seconds) */ * (in seconds) */
CURLOPT(CURLOPT_MAXAGE_CONN, CURLOPTTYPE_LONG, 288), CURLOPT(CURLOPT_MAXAGE_CONN, CURLOPTTYPE_LONG, 288),
/* SASL authorisation identity */ /* SASL authorization identity */
CURLOPT(CURLOPT_SASL_AUTHZID, CURLOPTTYPE_STRINGPOINT, 289), CURLOPT(CURLOPT_SASL_AUTHZID, CURLOPTTYPE_STRINGPOINT, 289),
/* allow RCPT TO command to fail for some recipients */ /* allow RCPT TO command to fail for some recipients */

2
lib/curl_sasl.c
View File

@ -670,7 +670,7 @@ CURLcode Curl_sasl_continue(struct SASL *sasl, struct Curl_easy *data,
#endif #endif
case SASL_OAUTH2: case SASL_OAUTH2:
/* Create the authorisation message */ /* Create the authorization message */
if(sasl->authused == SASL_MECH_OAUTHBEARER) { if(sasl->authused == SASL_MECH_OAUTHBEARER) {
result = Curl_auth_create_oauth_bearer_message(conn->user, result = Curl_auth_create_oauth_bearer_message(conn->user,
hostname, hostname,

6
lib/hmac.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -39,8 +39,8 @@
* Generic HMAC algorithm. * Generic HMAC algorithm.
* *
* This module computes HMAC digests based on any hash function. Parameters * This module computes HMAC digests based on any hash function. Parameters
* and computing procedures are set-up dynamically at HMAC computation * and computing procedures are set-up dynamically at HMAC computation context
* context initialisation. * initialization.
*/ */
static const unsigned char hmac_ipad = 0x36; static const unsigned char hmac_ipad = 0x36;

2
lib/setopt.c
View File

@ -2602,7 +2602,7 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, va_list param)
#endif #endif
case CURLOPT_SASL_AUTHZID: case CURLOPT_SASL_AUTHZID:
/* Authorisation identity (identity to act as) */ /* Authorization identity (identity to act as) */
result = Curl_setstropt(&data->set.str[STRING_SASL_AUTHZID], result = Curl_setstropt(&data->set.str[STRING_SASL_AUTHZID],
va_arg(param, char *)); va_arg(param, char *));
break; break;

4
lib/socks.h
View File

@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -69,7 +69,7 @@ CURLproxycode Curl_SOCKS5(const char *proxy_name,
#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI) #if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)
/* /*
* This function handles the SOCKS5 GSS-API negotiation and initialisation * This function handles the SOCKS5 GSS-API negotiation and initialization
*/ */
CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex, CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
struct Curl_easy *data); struct Curl_easy *data);

2
lib/urldata.h
View File

@ -983,7 +983,7 @@ struct connectdata {
char *user; /* user name string, allocated */ char *user; /* user name string, allocated */
char *passwd; /* password string, allocated */ char *passwd; /* password string, allocated */
char *options; /* options string, allocated */ char *options; /* options string, allocated */
char *sasl_authzid; /* authorisation identity string, allocated */ char *sasl_authzid; /* authorization identity string, allocated */
unsigned char httpversion; /* the HTTP version*10 reported by the server */ unsigned char httpversion; /* the HTTP version*10 reported by the server */
struct curltime now; /* "current" time */ struct curltime now; /* "current" time */
struct curltime created; /* creation time */ struct curltime created; /* creation time */

3
lib/vtls/gskit.c
View File

@ -449,8 +449,7 @@ static CURLcode set_ciphers(struct Curl_easy *data,
static int gskit_init(void) static int gskit_init(void)
{ {
/* No initialisation needed. */ /* No initialization needed. */
return 1; return 1;
} }

2
packages/OS400/README.OS400
View File

@ -264,7 +264,7 @@ _ Enter Qshell (QSH, not PASE)
_ Change current directory to the curl installation directory _ Change current directory to the curl installation directory
_ Change current directory to ./packages/OS400 _ Change current directory to ./packages/OS400
_ Edit file iniscript.sh. You may want to change tunable configuration _ Edit file iniscript.sh. You may want to change tunable configuration
parameters, like debug info generation, optimisation level, listing option, parameters, like debug info generation, optimization level, listing option,
target library, ZLIB/LIBSSH2 availability and location, etc. target library, ZLIB/LIBSSH2 availability and location, etc.
_ Copy any file in the current directory to makelog (i.e.: _ Copy any file in the current directory to makelog (i.e.:
cp initscript.sh makelog): this is intended to create the makelog file with cp initscript.sh makelog): this is intended to create the makelog file with

2
packages/OS400/initscript.sh
View File

@ -73,7 +73,7 @@ setenv DYNBNDDIR 'CURL' # Dynamic binding directory.
setenv SRVPGM "CURL.${SONAME}" # Service program. setenv SRVPGM "CURL.${SONAME}" # Service program.
setenv TGTCCSID '500' # Target CCSID of objects. setenv TGTCCSID '500' # Target CCSID of objects.
setenv DEBUG '*ALL' # Debug level. setenv DEBUG '*ALL' # Debug level.
setenv OPTIMIZE '10' # Optimisation level setenv OPTIMIZE '10' # Optimization level
setenv OUTPUT '*NONE' # Compilation output option. setenv OUTPUT '*NONE' # Compilation output option.
setenv TGTRLS '*CURRENT' # Target OS release. setenv TGTRLS '*CURRENT' # Target OS release.
setenv IFSDIR '/curl' # Installation IFS directory. setenv IFSDIR '/curl' # Installation IFS directory.

2
src/tool_cfgable.h
View File

@ -110,7 +110,7 @@ struct OperationConfig {
struct curl_slist *mail_rcpt; struct curl_slist *mail_rcpt;
char *mail_auth; char *mail_auth;
bool mail_rcpt_allowfails; /* --mail-rcpt-allowfails */ bool mail_rcpt_allowfails; /* --mail-rcpt-allowfails */
char *sasl_authzid; /* Authorisation identity (identity to use) */ char *sasl_authzid; /* Authorization identity (identity to use) */
bool sasl_ir; /* Enable/disable SASL initial response */ bool sasl_ir; /* Enable/disable SASL initial response */
bool proxytunnel; bool proxytunnel;
bool ftp_append; /* APPE on ftp */ bool ftp_append; /* APPE on ftp */

4
src/tool_easysrc.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -59,7 +59,7 @@ static const char *const srchead[]={
NULL NULL
}; };
/* easysrc_decl declarations come here */ /* easysrc_decl declarations come here */
/* easysrc_data initialisations come here */ /* easysrc_data initialization come here */
/* easysrc_code statements come here */ /* easysrc_code statements come here */
static const char *const srchard[]={ static const char *const srchard[]={
"/* Here is a list of options the curl code used that cannot get generated", "/* Here is a list of options the curl code used that cannot get generated",

4
tests/convsrctest.pl
View File

@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___ # | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____| # \___|\___/|_| \_\_____|
# #
# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. # Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
# #
# This software is licensed as described in the file COPYING, which # This software is licensed as described in the file COPYING, which
# you should have received as part of this distribution. The terms # you should have received as part of this distribution. The terms
@ -136,7 +136,7 @@ sub generate_c {
} }
elsif(! $seen_setopt) { elsif(! $seen_setopt) {
if(/^\s*(int main|\{|CURLcode |CURL |hnd = curl_easy_init)/) { if(/^\s*(int main|\{|CURLcode |CURL |hnd = curl_easy_init)/) {
# Initialisations handled by boilerplate # Initialization handled by boilerplate
next; next;
} }
else { else {