diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | env.c | 2 | ||||
| -rw-r--r-- | fetchmail.c | 4 | ||||
| -rw-r--r-- | fetchmail.man | 2 |
4 files changed, 7 insertions, 4 deletions
@@ -2,6 +2,9 @@ (The `lines' figures total .c, .h, .l, and .y files under version control.) +* Fixed brown-paper-bag bugs involving rcfile initialization. +* In fetchmailconf, don't permit editing of a blank server entry. + fetchmail-5.3.7 (Sun Apr 16 03:46:13 EDT 2000), 18975 lines: * Updated and corrected version of contrib/domino. @@ -95,7 +95,7 @@ void envquery(int argc, char **argv) * for its files. We don't want to do that if fetchmail has its * own home ($FETCHMAILHOME), however. */ - rcfile = (char *)xmalloc(strlen(fmhome)+sizeof(RCFILE_NAME)+(fmhome==home)+1); + rcfile = (char *)xmalloc(strlen(fmhome)+sizeof(RCFILE_NAME)+(fmhome==home)+2); /* avoid //.fetchmailrc */ if (strcmp(fmhome, "/") != 0) strcpy(rcfile, fmhome); diff --git a/fetchmail.c b/fetchmail.c index 75f2bf14..d68bffca 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -158,7 +158,7 @@ int main(int argc, char **argv) } #define IDFILE_NAME ".fetchids" - run.idfile = (char *) xmalloc(strlen(fmhome)+sizeof(IDFILE_NAME)+1); + run.idfile = (char *) xmalloc(strlen(fmhome)+sizeof(IDFILE_NAME)+2); strcpy(run.idfile, fmhome); strcat(run.idfile, "/"); strcat(run.idfile, IDFILE_NAME); @@ -288,7 +288,7 @@ int main(int argc, char **argv) #define NETRC_FILE ".netrc" /* parse the ~/.netrc file (if present) for future password lookups. */ - xalloca(netrc_file, char *, strlen(home) + sizeof(NETRC_FILE) + 1); + xalloca(netrc_file, char *, strlen(home) + sizeof(NETRC_FILE) + 2); strcpy (netrc_file, home); strcat (netrc_file, "/"); strcat (netrc_file, NETRC_FILE); diff --git a/fetchmail.man b/fetchmail.man index 4b35fa8a..2ab32ab1 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -1936,7 +1936,7 @@ If the environment variable FETCHMAILHOME is set to a valid and existing directory name, the .fetchmailrc and .fetchids and \&.fetchmail.pid files are put there instead of in the invoking user's home directory (and lose the leading dots on theirt names). The -.netrc file is looked for in the the invoking user's home directory +\&.netrc file is looked for in the the invoking user's home directory regardless of FETCHMAILHOME's setting. .SH SIGNALS |