diff -ru fetchmail-6.1.0.orig/conf.c fetchmail-6.1.0/conf.c --- fetchmail-6.1.0.orig/conf.c 2002-04-01 09:46:54.000000000 +0200 +++ fetchmail-6.1.0/conf.c 2002-09-25 15:07:36.000000000 +0200 @@ -294,6 +294,8 @@ stringdump("auth", "kerberos_v5"); else if (ctl->server.authenticate == A_SSH) stringdump("auth", "ssh"); + else if (ctl->server.authenticate == A_OTP) + stringdump("auth", "otp"); #if defined(HAVE_GETHOSTBYNAME) && defined(HAVE_RES_SEARCH) booldump("dns", ctl->server.dns); diff -ru fetchmail-6.1.0.orig/fetchmailconf fetchmail-6.1.0/fetchmailconf --- fetchmail-6.1.0.orig/fetchmailconf 2002-09-13 09:21:53.000000000 +0200 +++ fetchmail-6.1.0/fetchmailconf 2002-09-25 15:05:09.000000000 +0200 @@ -414,7 +414,7 @@ "ETRN":25, "ODMR":366} -authlist = ("any", "password", "gssapi", "kerberos", "ssh") +authlist = ("any", "password", "gssapi", "kerberos", "ssh", "otp") listboxhelp = { 'title' : 'List Selection Help', diff -ru fetchmail-6.1.0.orig/options.c fetchmail-6.1.0/options.c --- fetchmail-6.1.0.orig/options.c 2002-09-09 10:04:25.000000000 +0200 +++ fetchmail-6.1.0/options.c 2002-09-25 15:04:02.000000000 +0200 @@ -409,6 +409,8 @@ ctl->server.authenticate = A_SSH; else if (strcmp(optarg, "otp") == 0) ctl->server.authenticate = A_OTP; + else if (strcmp(optarg, "opie") == 0) + ctl->server.authenticate = A_OTP; else if (strcmp(optarg, "ntlm") == 0) ctl->server.authenticate = A_NTLM; else if (strcmp(optarg, "cram") == 0) @@ -677,7 +679,7 @@ P(GT_(" -p, --protocol specify retrieval protocol (see man page)\n")); P(GT_(" -U, --uidl force the use of UIDLs (pop3 only)\n")); P(GT_(" -P, --port TCP/IP service port to connect to\n")); - P(GT_(" --auth authentication type (password/kerberos/ssh)\n")); + P(GT_(" --auth authentication type (password/kerberos/ssh/otp)\n")); P(GT_(" -t, --timeout server nonresponse timeout\n")); P(GT_(" -E, --envelope envelope address header\n")); P(GT_(" -Q, --qvirtual prefix to remove from local user id\n")); diff -ru fetchmail-6.1.0.orig/rcfile_l.l fetchmail-6.1.0/rcfile_l.l --- fetchmail-6.1.0.orig/rcfile_l.l 2002-09-13 08:58:22.000000000 +0200 +++ fetchmail-6.1.0/rcfile_l.l 2002-09-25 15:52:40.000000000 +0200 @@ -92,6 +92,7 @@ kerberos(_v)?5 { SETSTATE(0); yylval.proto = A_KERBEROS_V5; return AUTHTYPE;} kerberos { SETSTATE(0); yylval.proto = A_KERBEROS_V4; return AUTHTYPE;} ssh { SETSTATE(0); yylval.proto = A_SSH; return AUTHTYPE;} +(otp|opie) { SETSTATE(0); yylval.proto = A_OTP; return AUTHTYPE;} cram(-md5)? { SETSTATE(0); yylval.proto = A_CRAM_MD5; return AUTHTYPE;} ntlm { SETSTATE(0); yylval.proto = A_NTLM; return AUTHTYPE;} password { SETSTATE(0); yylval.proto = A_PASSWORD; return AUTHTYPE;}