[patch] patch used in nmh-1.1rc1 ebuild

nmh-inc-login.diff (text/plain), 620 bytes, created by Claes Nästén on 2003-07-29 03:44:38 UTC

diff -ru ../nmh-1.1-RC1.orig/uip/inc.c ./uip/inc.c
--- ../nmh-1.1-RC1.orig/uip/inc.c	2003-07-29 12:14:50.788626792 +0200
+++ ./uip/inc.c	2003-07-29 12:15:45.187356928 +0200
@@ -487,8 +487,7 @@
      * a POP server?
      */
     if (inc_type == INC_POP) {
-	if (user == NULL)
-	    user = getusername ();
+
 	if ( strcmp( POPSERVICE, "kpop" ) == 0 ) {
 	    kpop = 1;
 	}
@@ -497,6 +496,12 @@
 	else
 	    ruserpass (host, &user, &pass);
 
+	/* 
+	 * Do this _after_ ruserpass, otherwise the login field will be unusable
+	 */
+	if (user == NULL)
+	    user = getusername ();
+
 	/*
 	 * initialize POP connection
 	 */