X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=options.c;h=5f1739c4f6e4cdbb50c2f1975f6367ca5ff0913b;hb=f16d8d23439b5569f0c2e1af22494708b507f277;hp=356bbc91c8e1661bb0626c370958ddcf15aa9ab3;hpb=98bdc445738682c067752f8d467c2b0841fc6306;p=~andy%2Ffetchmail

diff --git a/options.c b/options.c
index 356bbc91..5f1739c4 100644
--- a/options.c
+++ b/options.c
@@ -201,7 +201,10 @@ static int xatoi(char *s, int *errflagptr)
 int parsecmdline (int argc /** argument count */,
 		  char **argv /** argument strings */,
 		  struct runctl *rctl /** global run controls to modify */,
-		  struct query *ctl /** option record to initialize */)
+		  struct query *ctl /** option record to initialize */,
+		  flag *safewithbg /** set to whether options are
+				     compatible with another copy
+				     running in the background */)
 {
     /*
      * return value: if positive, argv index of last parsed option + 1
@@ -216,9 +219,12 @@ int parsecmdline (int argc /** argument count */,
     int errflag = 0;	/* TRUE when a syntax error is detected */
     int helpflag = 0;	/* TRUE when option help was explicitly requested */
     int option_index;
+    int option_safe;	/* to track if option currently parsed is safe
+			   with a background copy */
     char *buf, *cp;
 
     rctl->poll_interval = -1;
+    *safewithbg = TRUE;
 
     memset(ctl, '\0', sizeof(struct query));    /* start clean */
     ctl->smtp_socket = -1;
@@ -227,6 +233,8 @@ int parsecmdline (int argc /** argument count */,
 	   (c = getopt_long(argc,argv,shortoptions,
 			    longoptions, &option_index)) != -1)
     {
+	option_safe = FALSE;
+
 	switch (c) {
 #ifdef HAVE_LIBPWMD
 	case 'C':
@@ -241,18 +249,21 @@ int parsecmdline (int argc /** argument count */,
 #endif
 	case 'V':
 	    versioninfo = TRUE;
+	    option_safe = TRUE;
 	    break;
 	case 'c':
 	    check_only = TRUE;
 	    break;
 	case 's':
 	    outlevel = O_SILENT;
+	    option_safe = 1;
 	    break;
 	case 'v':
 	    if (outlevel >= O_VERBOSE)
 		outlevel = O_DEBUG;
 	    else
 		outlevel = O_VERBOSE;
+	    option_safe = TRUE;
 	    break;
 	case 'd':
 	    rctl->poll_interval = xatoi(optarg, &errflag);
@@ -319,12 +330,10 @@ int parsecmdline (int argc /** argument count */,
 #endif /* SDPS_ENABLE */
 	    else if (strcasecmp(optarg,"pop3") == 0)
 		ctl->server.protocol = P_POP3;
-	    else if (strcasecmp(optarg,"apop") == 0)
-		ctl->server.protocol = P_APOP;
 	    else if (strcasecmp(optarg,"kpop") == 0)
 	    {
 		ctl->server.protocol = P_POP3;
-		ctl->server.service = KPOP_PORT;
+		ctl->server.service = xstrdup(KPOP_PORT);
 #ifdef KERBEROS_V5
 		ctl->server.authenticate =  A_KERBEROS_V5;
 #endif /* KERBEROS_V5 */
@@ -341,7 +350,7 @@ int parsecmdline (int argc /** argument count */,
 	    }
 	    break;
 	case 'U':
-	    ctl->server.uidl = FLAG_TRUE;
+	    /* EMPTY - removed in 7.0.0 */
 	    break;
 	case LA_IDLE:
 	    ctl->idle = FLAG_TRUE;
@@ -378,6 +387,8 @@ int parsecmdline (int argc /** argument count */,
 		ctl->server.authenticate = A_ANY;
 	    else if (strcmp(optarg, "msn") == 0)
 		ctl->server.authenticate = A_MSN;
+	    else if (strcmp(optarg, "apop") == 0)
+		ctl->server.authenticate = A_APOP;
 	    else {
 		fprintf(stderr,GT_("Invalid authentication `%s' specified.\n"), optarg);
 		errflag++;
@@ -565,6 +576,7 @@ int parsecmdline (int argc /** argument count */,
 
 	case LA_CONFIGDUMP:
 	    configdump = TRUE;
+	    option_safe = TRUE;
 	    break;
 
 	case LA_SYSLOG:
@@ -593,9 +605,11 @@ int parsecmdline (int argc /** argument count */,
 	    break;
 
 	case '?':
+	    helpflag = 1;
 	default:
-	    helpflag++;
+	    break;
 	}
+	*safewithbg &= option_safe;
     }
 
     if (errflag || ocount > 1 || helpflag) {
@@ -635,7 +649,7 @@ int parsecmdline (int argc /** argument count */,
 	P(GT_("      --sslcertpath path to trusted-CA ssl certificate directory\n"));
 	P(GT_("      --sslcommonname  expect this CommonName from server (discouraged)\n"));
 	P(GT_("      --sslfingerprint fingerprint that must match that of the server's cert.\n"));
-	P(GT_("      --sslproto    force ssl protocol (SSL2/SSL3/TLS1)\n"));
+	P(GT_("      --sslproto    force ssl protocol (SSL23/SSL3/TLS1)\n"));
 #endif
 	P(GT_("      --plugin      specify external command to open connection\n"));
 	P(GT_("      --plugout     specify external command to open smtp connection\n"));
@@ -650,8 +664,7 @@ int parsecmdline (int argc /** argument count */,
         P(GT_("  -G, --pwmd-file   filename to use on the pwmd server\n"));
         P(GT_("  -O, --pinentry-timeout   seconds until pinentry is canceled\n"));
 #endif
- 
-	P(GT_("  -U, --uidl        force the use of UIDLs (pop3 only)\n"));
+
 	P(GT_("      --port        TCP port to connect to (obsolete, use --service)\n"));
 	P(GT_("  -P, --service     TCP service to connect to (can be numeric TCP port)\n"));
 	P(GT_("      --auth        authentication type (password/kerberos/ssh/otp)\n"));