aboutsummaryrefslogtreecommitdiffstats
path: root/fetchmail.c
diff options
context:
space:
mode:
Diffstat (limited to 'fetchmail.c')
-rw-r--r--fetchmail.c15
1 files changed, 2 insertions, 13 deletions
diff --git a/fetchmail.c b/fetchmail.c
index de95b785..9d39d904 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -277,10 +277,7 @@ int showversioninfo()
int dump_options (options)
struct optrec *options;
{
- if (!options->loginid[0])
- printf(" No password set\n");
- else
- printf(" Username = '%s'\n", options->username);
+ printf(" Username = '%s'\n", options->remotename);
printf(" Password = '%s'\n", options->password);
printf(" Protocol is ");
@@ -551,15 +548,7 @@ struct optrec *options;
/* punch in a null terminator */
if (*argp != '\0')
*(argp++) = '\0';
-
- /* check for macros */
- if (strcmp(mda_argv[argi],"$u") == 0)
- mda_argv[argi] =
- strcpy((char *) malloc(strlen(options->loginid)+1),options->loginid);
- else
- ; /* no macros to expand */
-
- }
+ }
mda_argv[argi] = (char *) 0;
}