1 files changed, 5 insertions, 4 deletions
diff --git a/driver.c b/driver.c
index 32f8c6fc..ecdff84d 100644
--- a/driver.c
+++ b/driver.c
@@ -555,10 +555,11 @@ struct query *ctl;	/* query control record */
 	    }
 
 	    /* if nothing supplied localnames, default appropriately */
-	    if (getuid() == 0)
-		save_uid(&xmit_names, -1, ctl->remotename);
-	    else
-		save_uid(&xmit_names, -1, user);
+	    if (!xmit_names)
+		if (getuid() == 0)
+		    save_uid(&xmit_names, -1, ctl->remotename);
+		else
+		    save_uid(&xmit_names, -1, user);
 
 	    /* time to address the message */
 	    if (ctl->mda[0])	/* we have a declared MDA */