No known servers now give it indigestion.

svn path=/trunk/; revision=513

2 files changed, 3 insertions, 10 deletions

diff --git a/driver.c b/driver.c
index 50eb8039..9b0aee0f 100644
--- a/driver.c
+++ b/driver.c
@@ -360,17 +360,11 @@ struct query *ctl;	/* query control record */
 	    /* if nothing supplied localnames, default appropriately */
 	    if (!xmit_names)
 	    {
-		char	*dflt;
-
-		if (getuid() == 0)
-		    dflt = ctl->remotename;
-		else
-		    dflt = user;
-		save_uid(&xmit_names, -1, dflt);
+		save_uid(&xmit_names, -1, user);
 		if (outlevel == O_VERBOSE)
 		    fprintf(stderr, 
 			    "fetchmail: no local matches, forwarding to %s\n",
-			    dflt);
+			    user);
 	    }
 
 	    /* time to address the message */
diff --git a/fetchmail.man b/fetchmail.man
index c8e9d6db..987b01f0 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -465,8 +465,7 @@ When there is more than one local name (or name mapping) the
 retrieved mail. When a declared mailserver username is recognized, its
 local mapping is added to the list of local recipients.  If
 \fIfetchmail\fR cannot recognize any mailserver usernames, the default
-recipient is the calling user, unless the calling user is root in
-which case it is the remote user name of the current entry.
+recipient is the calling user.
 .PP
 The \fBpassword\fR option requires a string argument, which is the password
 to be used with the entry's server.