X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=fetchmail.c;h=021a1af00a409c43e06c85c87fbdf9daea136bd3;hb=0aa3f030cdb0ab4a8e45360e6c1ec599d97e8acd;hp=e79d227692f7bbe3d145b7b73d750b3fa1107fe7;hpb=60e35f2db3a7f243cdbd622dac20ec75c89db999;p=~andy%2Ffetchmail

diff --git a/fetchmail.c b/fetchmail.c
index e79d2276..021a1af0 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -133,8 +133,8 @@ static void printcopyright(FILE *fp) {
 	fprintf(fp, GT_("Copyright (C) 2002, 2003 Eric S. Raymond\n"
 		   "Copyright (C) 2004 Matthias Andree, Eric S. Raymond,\n"
 		   "                   Robert M. Funk, Graham Wilson\n"
-		   "Copyright (C) 2005 - 2006, 2010 Sunil Shetye\n"
-		   "Copyright (C) 2005 - 2011 Matthias Andree\n"
+		   "Copyright (C) 2005 - 2006, 2010 - 2012 Sunil Shetye\n"
+		   "Copyright (C) 2005 - 2012 Matthias Andree\n"
 		   ));
 	fprintf(fp, GT_("Fetchmail comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
 		   "are welcome to redistribute it under certain conditions. For details,\n"
@@ -1815,7 +1815,6 @@ static int query_host(struct query *ctl)
 	ctl->server.protocol = P_AUTO;
 	break;
     case P_POP3:
-    case P_APOP:
 #ifdef POP3_ENABLE
 	do {
 	    st = doPOP3(ctl);
@@ -1939,12 +1938,8 @@ static void dump_params (struct runctl *runp,
 		printf(GT_("  Password will be prompted for.\n"));
 	    else if (outlevel >= O_VERBOSE)
 	    {
-		if (ctl->server.protocol == P_APOP)
-		    printf(GT_("  APOP secret = \"%s\".\n"),
-			   visbuf(ctl->password));
-		else
-		    printf(GT_("  Password = \"%s\".\n"),
-							visbuf(ctl->password));
+	        printf(GT_("  Password = \"%s\".\n"),
+				    visbuf(ctl->password));
 	    }
 	}
 
@@ -1990,6 +1985,11 @@ static void dump_params (struct runctl *runp,
 	case A_SSH:
 	    printf(GT_("  End-to-end encryption assumed.\n"));
 	    break;
+	case A_APOP:
+	    printf(GT_("  APOP authentication will be forced.\n"));
+	    break;
+	default:
+	    abort();
 	}
 	if (ctl->server.principal != (char *) NULL)
 	    printf(GT_("  Mail service principal is: %s\n"), ctl->server.principal);