aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric S. Raymond <esr@thyrsus.com>1997-05-14 21:23:45 +0000
committerEric S. Raymond <esr@thyrsus.com>1997-05-14 21:23:45 +0000
commit53d079783a95455d62ac3ed5bab8d7ef4b68567f (patch)
tree962dbea7ed8924efe651a33952432278be869498
parenta9ec199c14abe80d99512218db210d3175d6c50b (diff)
downloadfetchmail-53d079783a95455d62ac3ed5bab8d7ef4b68567f.tar.gz
fetchmail-53d079783a95455d62ac3ed5bab8d7ef4b68567f.tar.bz2
fetchmail-53d079783a95455d62ac3ed5bab8d7ef4b68567f.zip
Avoid KERBEROS_V4 redefinition.
svn path=/trunk/; revision=1005
-rw-r--r--rcfile_l.l4
-rw-r--r--rcfile_y.y4
2 files changed, 4 insertions, 4 deletions
diff --git a/rcfile_l.l b/rcfile_l.l
index a23e4dc0..f50062c1 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -34,8 +34,8 @@ local(domains) { return LOCALDOMAINS; }
proto(col)? { return PROTOCOL; }
port { return PORT; }
auth(enticate)? { return AUTHENTICATE; }
-kerberos_v4 { return KERBEROS_V4; }
-kerberos { return KERBEROS_V4; }
+kerberos_v4 { return KERBEROS4; }
+kerberos { return KERBEROS4; }
timeout { return TIMEOUT;}
envelope { return ENVELOPE; }
diff --git a/rcfile_y.y b/rcfile_y.y
index 003854b8..c5da848a 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -42,7 +42,7 @@ static int reset_server(char *name, int skip);
}
%token DEFAULTS POLL SKIP AKA LOCALDOMAINS PROTOCOL
-%token AUTHENTICATE TIMEOUT KPOP KERBEROS_V4
+%token AUTHENTICATE TIMEOUT KPOP KERBEROS4
%token ENVELOPE USERNAME PASSWORD FOLDER SMTPHOST MDA PRECONNECT LIMIT
%token IS HERE THERE TO MAP WILDCARD
%token SET BATCHLIMIT FETCHLIMIT LOGFILE DAEMON INTERFACE MONITOR
@@ -122,7 +122,7 @@ serv_option : AKA alias_list
| NO UIDL {current.server.uidl = FLAG_FALSE;}
| PORT NUMBER {current.server.port = $2;}
| AUTHENTICATE PASSWORD {current.server.authenticate = A_PASSWORD;}
- | AUTHENTICATE KERBEROS_V4 {current.server.authenticate = A_KERBEROS_V4;}
+ | AUTHENTICATE KERBEROS4 {current.server.authenticate = A_KERBEROS_V4;}
| TIMEOUT NUMBER {current.server.timeout = $2;}
| ENVELOPE STRING {current.server.envelope = xstrdup($2);}
| INTERFACE STRING {