emo/sysklogd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace version.h with auto-generated version from configure script

Browse Source 
Also, remove DEBRELEASE, no longer a package with Debian focus, and add
'v' before version number in logs/usage text.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
This commit is contained in:
Joachim Nilsson
2018-08-02 23:02:49 +02:00
parent 363b9a2201
commit e6a88e13ed
3 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/syslogd.c
View File

@@ -563,7 +563,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88";
#ifndef TESTING
#include "pidfile.h"
#endif
#include "version.h"
#include "config.h"
#if defined(__linux__)
#include <paths.h>
@@ -979,7 +979,7 @@ int main(argc, argv)
StripDomains = crunch_list(optarg);
break;
case 'v':
printf("syslogd %s.%s\n", VERSION, PATCHLEVEL);
printf("syslogd v%s\n", VERSION);
exit (0);
case '?':
default:
@@ -2747,23 +2747,13 @@ void init()
}
if ( AcceptRemote )
#ifdef DEBRELEASE
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL "#" DEBRELEASE \
": restart (remote reception)." , LocalHostName, \
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd v" VERSION
": restart (remote reception)." , LocalHostName,
ADDDATE);
#else
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL \
": restart (remote reception)." , LocalHostName, \
ADDDATE);
#endif
else
#ifdef DEBRELEASE
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL "#" DEBRELEASE \
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd v" VERSION
": restart." , LocalHostName, ADDDATE);
#else
logmsg(LOG_SYSLOG|LOG_INFO, "syslogd " VERSION "." PATCHLEVEL \
": restart." , LocalHostName, ADDDATE);
#endif
(void) signal(SIGHUP, sighup_handler);
dprintf("syslogd: restarted.\n");
}