d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unconditional unlink at startup and conditionalised the unlink at exit

Browse Source 
so that it only unlinks the file if syslogd knows it created it.

If the path specified for the socket already exists then syslogd
will now exit with an "address already in use" error which is more
sensible than blindly unlinking the existing filename.  This stops
syslogd -d foo/bar from unlinking foo/bar if it's a real file.
This commit is contained in:
Paul Richards 1995-09-11 13:55:11 +00:00
parent 1be758653e
commit df1e48c2bb
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/syslogd/syslogd.c
View File

@ -190,6 +190,7 @@ int LogPort; /* port number for INET connections */
int Initialized = 0; /* set when we have initialized ourselves */
int MarkInterval = 20 * 60; /* interval between marks in seconds */
int MarkSeq = 0; /* mark sequence number */
int created_lsock = 0; /* Flag if local socket created */
void cfline __P((char *, struct filed *, char *));
char *cvthname __P((struct sockaddr_in *));
@ -258,7 +259,6 @@ main(argc, argv)
(void)signal(SIGCHLD, reapchild);
(void)signal(SIGALRM, domark);
(void)alarm(TIMERINTVL);
(void)unlink(LogName);
#ifndef SUN_LEN
#define SUN_LEN(unp) (strlen((unp)->sun_path) + 2)
@ -274,7 +274,8 @@ main(argc, argv)
logerror(line);
dprintf("cannot create %s (%d)\n", LogName, errno);
die(0);
}
} else
created_lsock = 1;
finet = socket(AF_INET, SOCK_DGRAM, 0);
inetm = 0;
if (finet >= 0) {
@ -876,7 +877,8 @@ die(signo)
errno = 0;
logerror(buf);
}
(void)unlink(LogName);
if (created_lsock)
(void)unlink(LogName);
exit(0);
}