- {"help", no_argument, (int *) 0, LA_HELP },
- {"version", no_argument, (int *) 0, LA_VERSION },
- {"check", no_argument, (int *) 0, LA_CHECK },
- {"silent", no_argument, (int *) 0, LA_SILENT },
- {"verbose", no_argument, (int *) 0, LA_VERBOSE },
- {"daemon", required_argument, (int *) 0, LA_DAEMON },
- {"nodetach", no_argument, (int *) 0, LA_NODETACH },
- {"quit", no_argument, (int *) 0, LA_QUIT },
- {"logfile", required_argument, (int *) 0, LA_LOGFILE },
- {"invisible", no_argument, (int *) 0, LA_INVISIBLE },
- {"syslog", no_argument, (int *) 0, LA_SYSLOG },
- {"nosyslog", no_argument, (int *) 0, LA_NOSYSLOG },
- {"fetchmailrc",required_argument,(int *) 0, LA_RCFILE },
- {"idfile", required_argument, (int *) 0, LA_IDFILE },
- {"postmaster",required_argument, (int *) 0, LA_POSTMASTER },
- {"nobounce", no_argument, (int *) 0, LA_NOBOUNCE },
-
- {"protocol", required_argument, (int *) 0, LA_PROTOCOL },
- {"proto", required_argument, (int *) 0, LA_PROTOCOL },
- {"uidl", no_argument, (int *) 0, LA_UIDL },
- {"port", required_argument, (int *) 0, LA_PORT },
- {"preauth", required_argument, (int *) 0, LA_PREAUTH},
- {"timeout", required_argument, (int *) 0, LA_TIMEOUT },
- {"envelope", required_argument, (int *) 0, LA_ENVELOPE },
- {"qvirtual", required_argument, (int *) 0, LA_QVIRTUAL },
-
- {"user", required_argument, (int *) 0, LA_USERNAME },
- {"username", required_argument, (int *) 0, LA_USERNAME },
-
- {"all", no_argument, (int *) 0, LA_ALL },
- {"nokeep", no_argument, (int *) 0, LA_NOKEEP },
- {"keep", no_argument, (int *) 0, LA_KEEP },
- {"flush", no_argument, (int *) 0, LA_FLUSH },
- {"norewrite", no_argument, (int *) 0, LA_NOREWRITE },
- {"limit", required_argument, (int *) 0, LA_LIMIT },
- {"warnings", required_argument, (int *) 0, LA_WARNINGS },
-
- {"folder", required_argument, (int *) 0, LA_FOLDER },
- {"smtphost", required_argument, (int *) 0, LA_SMTPHOST },
- {"smtpaddress", required_argument, (int *) 0, LA_SMTPADDR },
- {"antispam", required_argument, (int *) 0, LA_ANTISPAM },
-
- {"batchlimit",required_argument, (int *) 0, LA_BATCHLIMIT },
- {"fetchlimit",required_argument, (int *) 0, LA_FETCHLIMIT },
- {"expunge", required_argument, (int *) 0, LA_EXPUNGE },
- {"mda", required_argument, (int *) 0, LA_MDA },
- {"bsmtp", required_argument, (int *) 0, LA_BSMTP },
- {"lmtp", no_argument, (int *) 0, LA_LMTP },
-
-#ifdef INET6_ENABLE
- {"netsec", required_argument, (int *) 0, LA_NETSEC },
-#endif /* INET6_ENABLE */
+#ifdef HAVE_LIBPWMD
+ {"pwmd-socket", required_argument, (int *) 0, 'C' },
+ {"pwmd-file", required_argument, (int *) 0, 'G' },
+ {"pinentry-timeout", required_argument, (int *) 0, 'O' },
+#endif
+ {"help", no_argument, (int *) 0, '?' },
+ {"version", no_argument, (int *) 0, 'V' },
+ {"check", no_argument, (int *) 0, 'c' },
+ {"silent", no_argument, (int *) 0, 's' },
+ {"verbose", no_argument, (int *) 0, 'v' },
+ {"daemon", required_argument, (int *) 0, 'd' },
+ {"nodetach", no_argument, (int *) 0, 'N' },
+ {"quit", no_argument, (int *) 0, 'q' },
+ {"logfile", required_argument, (int *) 0, 'L' },
+ {"invisible", no_argument, (int *) 0, LA_INVISIBLE },
+ {"showdots", no_argument, (int *) 0, LA_SHOWDOTS },
+ {"syslog", no_argument, (int *) 0, LA_SYSLOG },
+ {"nosyslog", no_argument, (int *) 0, LA_NOSYSLOG },
+ {"fetchmailrc",required_argument,(int *) 0, 'f' },
+ {"idfile", required_argument, (int *) 0, 'i' },
+ {"pidfile", required_argument, (int *) 0, LA_PIDFILE },
+ {"postmaster",required_argument, (int *) 0, LA_POSTMASTER },
+ {"nobounce", no_argument, (int *) 0, LA_NOBOUNCE },
+ {"nosoftbounce", no_argument, (int *) 0, LA_NOSOFTBOUNCE },
+ {"softbounce", no_argument, (int *) 0, LA_SOFTBOUNCE },
+
+ {"protocol", required_argument, (int *) 0, 'p' },
+ {"proto", required_argument, (int *) 0, 'p' },
+ {"uidl", no_argument, (int *) 0, 'U' },
+ {"idle", no_argument, (int *) 0, LA_IDLE},
+ {"port", required_argument, (int *) 0, 'P' },
+ {"service", required_argument, (int *) 0, 'P' },
+ {"auth", required_argument, (int *) 0, LA_AUTH},
+ {"timeout", required_argument, (int *) 0, 't' },
+ {"envelope", required_argument, (int *) 0, 'E' },
+ {"qvirtual", required_argument, (int *) 0, 'Q' },
+ {"bad-header",required_argument, (int *) 0, LA_BADHEADER},
+
+ {"user", required_argument, (int *) 0, 'u' },
+ {"username", required_argument, (int *) 0, 'u' },
+
+ {"all", no_argument, (int *) 0, 'a' },
+ {"fetchall", no_argument, (int *) 0, 'a' },
+ {"nokeep", no_argument, (int *) 0, 'K' },
+ {"keep", no_argument, (int *) 0, 'k' },
+ {"flush", no_argument, (int *) 0, 'F' },
+ {"limitflush", no_argument, (int *) 0, LA_LIMITFLUSH },
+ {"norewrite", no_argument, (int *) 0, 'n' },
+ {"limit", required_argument, (int *) 0, 'l' },
+ {"warnings", required_argument, (int *) 0, 'w' },
+ {"retrieve-error", required_argument, (int *) 0, LA_RETRIEVEERROR },
+
+ {"folder", required_argument, (int *) 0, 'r' },
+ {"smtphost", required_argument, (int *) 0, 'S' },
+ {"fetchdomains", required_argument, (int *) 0, LA_FETCHDOMAINS },
+ {"smtpaddress", required_argument, (int *) 0, 'D' },
+ {"smtpname", required_argument, (int *) 0, LA_SMTPNAME },
+ {"antispam", required_argument, (int *) 0, 'Z' },
+
+ {"batchlimit",required_argument, (int *) 0, 'b' },
+ {"fetchlimit",required_argument, (int *) 0, 'B' },
+ {"fetchsizelimit",required_argument, (int *) 0, LA_FETCHSIZELIMIT },
+ {"fastuidl", required_argument, (int *) 0, LA_FASTUIDL },
+ {"expunge", required_argument, (int *) 0, 'e' },
+ {"mda", required_argument, (int *) 0, 'm' },
+ {"bsmtp", required_argument, (int *) 0, LA_BSMTP },
+ {"lmtp", no_argument, (int *) 0, LA_LMTP },