aboutsummaryrefslogtreecommitdiffstats
path: root/options.c
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>2001-02-19 20:31:30 +0000
committerEric S. Raymond <esr@thyrsus.com>2001-02-19 20:31:30 +0000
commitea8294a37ef78608fc3b50c8363e64d93d2d491d (patch)
tree19f356e39db49f1a658cd7f1fc797c439ced55de /options.c
parent665f79a142fb8db222aa6c6634173c25b2829d68 (diff)
downloadfetchmail-ea8294a37ef78608fc3b50c8363e64d93d2d491d.tar.gz
fetchmail-ea8294a37ef78608fc3b50c8363e64d93d2d491d.tar.bz2
fetchmail-ea8294a37ef78608fc3b50c8363e64d93d2d491d.zip
preauth -> auth.
svn path=/trunk/; revision=3121
Diffstat (limited to 'options.c')
-rw-r--r--options.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/options.c b/options.c
index e10ac840..88366aae 100644
--- a/options.c
+++ b/options.c
@@ -41,7 +41,7 @@
#define LA_PROTOCOL 17
#define LA_UIDL 18
#define LA_PORT 19
-#define LA_PREAUTH 20
+#define LA_AUTH 20
#define LA_TIMEOUT 21
#define LA_ENVELOPE 22
#define LA_QVIRTUAL 23
@@ -109,7 +109,7 @@ static const struct option longoptions[] = {
{"proto", required_argument, (int *) 0, LA_PROTOCOL },
{"uidl", no_argument, (int *) 0, LA_UIDL },
{"port", required_argument, (int *) 0, LA_PORT },
- {"preauth", required_argument, (int *) 0, LA_PREAUTH},
+ {"auth", required_argument, (int *) 0, LA_AUTH},
{"timeout", required_argument, (int *) 0, LA_TIMEOUT },
{"envelope", required_argument, (int *) 0, LA_ENVELOPE },
{"qvirtual", required_argument, (int *) 0, LA_QVIRTUAL },
@@ -351,9 +351,9 @@ struct query *ctl; /* option record to be initialized */
ctl->server.port = KPOP_PORT;
#endif /* INET6_ENABLE */
#ifdef KERBEROS_V5
- ctl->server.preauthenticate = A_KERBEROS_V5;
+ ctl->server.authenticate = A_KERBEROS_V5;
#else
- ctl->server.preauthenticate = A_KERBEROS_V4;
+ ctl->server.authenticate = A_KERBEROS_V4;
#endif /* KERBEROS_V5 */
}
else if (strcasecmp(optarg,"imap") == 0)
@@ -377,23 +377,23 @@ struct query *ctl; /* option record to be initialized */
ctl->server.port = xatoi(optarg, &errflag);
#endif /* INET6_ENABLE */
break;
- case LA_PREAUTH:
+ case LA_AUTH:
if (strcmp(optarg, "password") == 0)
- ctl->server.preauthenticate = A_PASSWORD;
+ ctl->server.authenticate = A_PASSWORD;
else if (strcmp(optarg, "kerberos") == 0)
#ifdef KERBEROS_V5
- ctl->server.preauthenticate = A_KERBEROS_V5;
+ ctl->server.authenticate = A_KERBEROS_V5;
#else
- ctl->server.preauthenticate = A_KERBEROS_V4;
+ ctl->server.authenticate = A_KERBEROS_V4;
#endif /* KERBEROS_V5 */
else if (strcmp(optarg, "kerberos_v5") == 0)
- ctl->server.preauthenticate = A_KERBEROS_V5;
+ ctl->server.authenticate = A_KERBEROS_V5;
else if (strcmp(optarg, "kerberos_v4") == 0)
- ctl->server.preauthenticate = A_KERBEROS_V4;
+ ctl->server.authenticate = A_KERBEROS_V4;
else if (strcmp(optarg, "ssh") == 0)
- ctl->server.preauthenticate = A_SSH;
+ ctl->server.authenticate = A_SSH;
else {
- fprintf(stderr,_("Invalid preauthentication `%s' specified.\n"), optarg);
+ fprintf(stderr,_("Invalid authentication `%s' specified.\n"), optarg);
errflag++;
}
break;
@@ -620,7 +620,7 @@ struct query *ctl; /* option record to be initialized */
P(_(" -p, --protocol specify retrieval protocol (see man page)\n"));
P(_(" -U, --uidl force the use of UIDLs (pop3 only)\n"));
P(_(" -P, --port TCP/IP service port to connect to\n"));
- P(_(" --preauth preauthentication type (password/kerberos/ssh)\n"));
+ P(_(" --auth authentication type (password/kerberos/ssh)\n"));
P(_(" -t, --timeout server nonresponse timeout\n"));
P(_(" -E, --envelope envelope address header\n"));
P(_(" -Q, --qvirtual prefix to remove from local user id\n"));