From 52d7849f4b51e2ea0f0bd24573efa5c3683442bd Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Tue, 10 Apr 2001 12:53:50 +0000
Subject: Minor cleanup patches.

svn path=/trunk/; revision=3289
---
 Makefile.in | 7 ++++---
 rcfile_l.l  | 6 +++---
 rcfile_y.y  | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 736ba2a9..70d58841 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,7 +4,7 @@
 # So just uncomment all the lines marked QNX.
 
 PACKAGE = fetchmail
-VERSION = 5.8.0
+VERSION = 5.8.1
 
 # Ultrix 2.2 make doesn't expand the value of VPATH.
 srcdir = @srcdir@
@@ -241,6 +241,7 @@ $(srcdir)/aclocal.m4: configure.in
 rcfile_l.c rcfile_l.h: $(srcdir)/rcfile_l.l
 	$(LEX) $(LEXFLAGS) $(srcdir)/rcfile_l.l
 	sed <lex.yy.c >rcfile_l.c -e "/lex\\.yy\\.c/s//rcfile_l.c/"
+	rm -f lex.yy.c
 rcfile_y.c rcfile_y.h: $(srcdir)/rcfile_y.y
 	@echo "expect conflicts:  2 shift/reduce"
 	$(YACC) $(YACCFLAGS) $(srcdir)/rcfile_y.y
@@ -249,8 +250,8 @@ rcfile_y.c rcfile_y.h: $(srcdir)/rcfile_y.y
 
 # These must be explicit, because the .c files often don't exist at
 # makefile build time. 
-rcfile_l.o: rcfile_y.c rcfile_y.h config.h fetchmail.h
-rcfile_y.o: rcfile_y.c rcfile_y.h config.h fetchmail.h
+rcfile_l.o: rcfile_l.c config.h fetchmail.h
+rcfile_y.o: rcfile_y.c config.h fetchmail.h
 
 parser = $(srcdir)/rcfile_l.l $(srcdir)/rcfile_y.y
 headers = $(srcdir)/fetchmail.h $(srcdir)/socket.h $(srcdir)/smtp.h \
diff --git a/rcfile_l.l b/rcfile_l.l
index 1bcc98a5..3d4040d5 100644
--- a/rcfile_l.l
+++ b/rcfile_l.l
@@ -14,7 +14,7 @@
 int prc_lineno = 1;
 
 #ifdef LEXDEBUG
-#define SETSTATE(n)	if (yydebug) do {BEGIN(n); fprintf(stderr, "Entering lexer state %d\n", n);} while (0)
+#define SETSTATE(n)	do {BEGIN(n); if (yydebug) fprintf(stderr, "Entering lexer state %d\n", n);} while (0)
 #else
 #define SETSTATE(n)	BEGIN(n)
 #endif /* LEXDEBUG */
@@ -92,14 +92,14 @@ kerberos	{ SETSTATE(0); yylval.proto = A_KERBEROS_V4; return AUTHTYPE;}
 ssh		{ SETSTATE(0); yylval.proto = A_SSH; return AUTHTYPE;}
 cram(-md5)?	{ SETSTATE(0); yylval.proto = A_CRAM_MD5; return AUTHTYPE;}
 ntlm		{ SETSTATE(0); yylval.proto = A_NTLM; return AUTHTYPE;}
-<AUTH>password { SETSTATE(0); return PASSWORD; }
+<AUTH>password	{ SETSTATE(0); yylval.proto = A_PASSWORD; return AUTHTYPE;}
 timeout		{ return TIMEOUT;}
 envelope	{ return ENVELOPE; }
 qvirtual	{ return QVIRTUAL; }
 principal	{ return PRINCIPAL; }
 
 user(name)?	{SETSTATE(NAME); return USERNAME; }
-pass(word)?	{SETSTATE(NAME); return PASSWORD; }
+<INITIAL,NAME>pass(word)?	{SETSTATE(NAME); return PASSWORD; }
 folder(s)? 	{ return FOLDER; }
 smtp(host)?	{ return SMTPHOST; }
 smtpaddress	{ return SMTPADDRESS; }
diff --git a/rcfile_y.y b/rcfile_y.y
index a3271dac..dfe8ec87 100644
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -226,7 +226,7 @@ serv_option	: AKA alias_list
 #if (defined(linux) && !defined(INET6_ENABLE)) || defined(__FreeBSD__)
 					current.server.monitor = xstrdup($2);
 #else /* (defined(linux) && !defined(INET6_ENABLE)) || defined(__FreeBSD__) */
-					fprintf(stderr, _("fetchmail: monitor option is only supported under Linux\n"));
+					fprintf(stderr, _("fetchmail: monitor option is only supported under Linux (without IPv6) and FreeBSD\n"));
 #endif /* (defined(linux) && !defined(INET6_ENABLE) || defined(__FreeBSD__)) */
 					}
 		| PLUGIN STRING		{ current.server.plugin = xstrdup($2); }
-- 
cgit v1.2.3