From d54b551f6c3ff66b7d2f04bd9780295ae7e454ce Mon Sep 17 00:00:00 2001
From: Michael Osipov <1983-01-06@gmx.net>
Date: Sat, 15 Nov 2014 11:10:29 +0000
Subject: [PATCH] docs: Use consistent naming for Kerberos
---
docs/INTERNALS | 2 +-
docs/libcurl/libcurl-tutorial.3 | 6 +++---
lib/urldata.h | 4 ++--
packages/vms/build_vms.com | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/INTERNALS b/docs/INTERNALS
index 70e060f3ea..8654c45f91 100644
--- a/docs/INTERNALS
+++ b/docs/INTERNALS
@@ -42,7 +42,7 @@ Portability
libidn 0.4.1
cyassl 2.0.0
openldap 2.0
- MIT krb5 lib 1.2.4
+ MIT Kerberos 1.2.4
GSKit V5R3M0
NSS 3.14.x
axTLS 1.2.7
diff --git a/docs/libcurl/libcurl-tutorial.3 b/docs/libcurl/libcurl-tutorial.3
index 4dcdc55f1d..d496e70274 100644
--- a/docs/libcurl/libcurl-tutorial.3
+++ b/docs/libcurl/libcurl-tutorial.3
@@ -1129,9 +1129,9 @@ analyzer tool and eavesdrop on your passwords. Don't let the fact that HTTP
Basic uses base64 encoded passwords fool you. They may not look readable at a
first glance, but they very easily "deciphered" by anyone within seconds.
-To avoid this problem, use HTTP authentication methods or other protocols that
-don't let snoopers see your password: HTTP with Digest, NTLM or GSS
-authentication, HTTPS, FTPS, SCP, SFTP and FTP-Kerberos are a few examples.
+To avoid this problem, use an authentication mechanism or other protocol that
+doesn't let snoopers see your password: Digest, CRAM-MD5, Kerberos, SPNEGO or
+NTLM authentication, HTTPS, FTPS, SCP and SFTP are a few examples.
.IP "Redirects"
The \fICURLOPT_FOLLOWLOCATION(3)\fP option automatically follows HTTP
diff --git a/lib/urldata.h b/lib/urldata.h
index 6238f62048..f708a74a7b 100644
--- a/lib/urldata.h
+++ b/lib/urldata.h
@@ -973,7 +973,7 @@ struct connectdata {
char *te; /* TE: request header */
} allocptr;
- int sec_complete; /* if kerberos is enabled for this connection */
+ int sec_complete; /* if Kerberos is enabled for this connection */
#ifdef HAVE_GSSAPI
enum protection_level command_prot;
enum protection_level data_prot;
@@ -1573,7 +1573,7 @@ struct UserDefined {
enum CURL_NETRC_OPTION
use_netrc; /* defined in include/curl.h */
bool verbose; /* output verbosity */
- bool krb; /* kerberos connection requested */
+ bool krb; /* Kerberos connection requested */
bool reuse_forbid; /* forbidden to be reused, close after use */
bool reuse_fresh; /* do not re-use an existing connection */
bool ftp_use_epsv; /* if EPSV is to be attempted or not */
diff --git a/packages/vms/build_vms.com b/packages/vms/build_vms.com
index 97c305d2af..7b840813f6 100644
--- a/packages/vms/build_vms.com
+++ b/packages/vms/build_vms.com
@@ -40,7 +40,7 @@ $! VAX must always use DFLOAT
$! NOLARGE Disable large-file support if large file support available.
$! (Non-VAX, VMS >= V7.2.)
$! NOLDAP Disable LDAP support if LDAP is available.
-$! NOKERBEROS Disable Kerberos support if Kerberos is available.
+$! NOKERBEROS Disable Kerberos support if Kerberos is not available.
$! LIST Create C compiler listings and linker maps.
$! /list/show=(expan,includ)/machine
$! FULLLIST Full detailed listing.
--
GitLab