Hi,
The LocalDomain in syslogd(8) is not used, remove variable.
Use RFC 5424 NILVALUE as fallback for LocalHostName.
ok?
bluhm
Index: usr.sbin/syslogd/syslogd.c
===================================================================
RCS file: /data/mirror/openbsd/cvs/src/usr.sbin/syslogd/syslogd.c,v
retrieving revision 1.269
diff -u -p -r1.269 syslogd.c
--- usr.sbin/syslogd/syslogd.c 10 Sep 2021 15:18:36 -0000 1.269
+++ usr.sbin/syslogd/syslogd.c 17 Sep 2021 14:25:19 -0000
@@ -218,7 +218,6 @@ struct filed consfile;
int Debug; /* debug flag */
int Foreground; /* run in foreground, instead of daemonizing */
char LocalHostName[HOST_NAME_MAX+1]; /* our hostname */
-char *LocalDomain; /* our local domain name */
int Started = 0; /* set after privsep */
int Initialized = 0; /* set when we have initialized ourselves */
@@ -507,12 +506,11 @@ main(int argc, char *argv[])
if (consfile.f_file == -1)
log_warn("open %s", consfile.f_un.f_fname);
- (void)gethostname(LocalHostName, sizeof(LocalHostName));
- if ((p = strchr(LocalHostName, '.')) != NULL) {
- *p++ = '\0';
- LocalDomain = p;
- } else
- LocalDomain = "";
+ if (gethostname(LocalHostName, sizeof(LocalHostName)) == -1 ||
+ LocalHostName[0] == '\0')
+ strlcpy(LocalHostName, "-", sizeof(LocalHostName));
+ else if ((p = strchr(LocalHostName, '.')) != NULL)
+ *p = '\0';
/* Reserve space for kernel message buffer plus buffer full message. */
linesize = getmsgbufsize() + 64;
