X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmsgchk.c;h=c7f32f5ba843325fed59e19c3b59b66e06db6b4b;hb=2c3d90ed127ab47e695350367ca3c34d4324bcc4;hp=fa2336f9e540c60da399800bb898464565eb817f;hpb=c05210483d82bf5f3786725ff80e12444088a701;p=mmh

diff --git a/uip/msgchk.c b/uip/msgchk.c
index fa2336f..c7f32f5 100644
--- a/uip/msgchk.c
+++ b/uip/msgchk.c
@@ -41,19 +41,19 @@ static struct swit switches[] = {
     { "host hostname", POPminc (-4) },
 #define	USERSW                   5
     { "user username", POPminc (-4) },
-#define PORTSW			 8
+#define PORTSW			 6
     { "port name/number", POPminc(-4) },
-#define VERSIONSW               10
+#define VERSIONSW                7
     { "version", 0 },
-#define	HELPSW                  11
+#define	HELPSW                   8
     { "help", 0 },
-#define SNOOPSW                 12
+#define SNOOPSW                  9
     { "snoop", -5 },
-#define SASLSW                  14
+#define SASLSW                  10
     { "sasl", SASLminc(-4) },
-#define SASLMECHSW		15
+#define SASLMECHSW		11
     { "saslmech", SASLminc(-5) },
-#define PROXYSW 		16
+#define PROXYSW 		12
     { "proxy command", POPminc(-5) },
     { NULL, 0 }
 };
@@ -96,7 +96,6 @@ main (int argc, char **argv)
     int datesw = 1, notifysw = NT_ALL;
     int status = 0, sasl = 0;
     int snoop = 0, vecp = 0;
-    uid_t uid;
     char *cp, *host = NULL, *port = NULL, *user, *proxy = NULL; 
     char buf[BUFSIZ], *saslmech = NULL; 
     char **argp, **arguments, *vec[MAXVEC];
@@ -116,7 +115,6 @@ main (int argc, char **argv)
     context_read();
 
     mts_init (invo_name);
-    uid = getuid ();
     user = getusername();
 
     arguments = getarguments (invo_name, argc, argv, 1);
@@ -369,7 +367,7 @@ remotemail (char *host, char *port, char *user, char *proxy, int notifysw,
 	ruserpass (host, &user, &pass);
 
     /* open the POP connection */
-    if (pop_init (host, user, port, pass, proxy, snoop, sasl, saslmech) == NOTOK
+    if (pop_init (host, port, user, pass, proxy, snoop, sasl, saslmech) == NOTOK
 	    || pop_stat (&nmsgs, &nbytes) == NOTOK	/* check for messages  */
 	    || pop_quit () == NOTOK) {			/* quit POP connection */
 	advise (NULL, "%s", response);