From 663841abe0bb1cc8040e552597ef721c35b799e5 Mon Sep 17 00:00:00 2001
From: Brian Wellington <source@isc.org>
Date: Tue, 18 Jul 2000 17:50:02 +0000
Subject: [PATCH]  338.   [bug]           lwresd logged to syslog as named, not
 lwresd.

---
 CHANGES                           |  2 ++
 bin/named/main.c                  |  4 ++--
 bin/named/unix/include/named/os.h |  4 ++--
 bin/named/unix/os.c               | 10 +++++-----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2e633c9050..fa09378c45 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,6 @@
 
+ 338.	[bug]		lwresd logged to syslog as named, not lwresd.
+
  337.	[bug]		"dig" did not recognize "nsap-ptr" as an RR type
 			on the command line.
 
diff --git a/bin/named/main.c b/bin/named/main.c
index 7ea819e798..0bc590f453 100644
--- a/bin/named/main.c
+++ b/bin/named/main.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: main.c,v 1.73 2000/07/10 11:34:56 tale Exp $ */
+/* $Id: main.c,v 1.74 2000/07/18 17:49:59 bwelling Exp $ */
 
 #include <config.h>
 
@@ -483,7 +483,7 @@ main(int argc, char *argv[]) {
 	isc_error_setfatal(library_fatal_error);
 	isc_error_setunexpected(library_unexpected_error);
 
-	ns_os_init();
+	ns_os_init(program_name);
 
 	result = isc_app_start();
 	if (result != ISC_R_SUCCESS)
diff --git a/bin/named/unix/include/named/os.h b/bin/named/unix/include/named/os.h
index 7082dd575d..be275f2215 100644
--- a/bin/named/unix/include/named/os.h
+++ b/bin/named/unix/include/named/os.h
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: os.h,v 1.8 2000/07/01 00:48:06 tale Exp $ */
+/* $Id: os.h,v 1.9 2000/07/18 17:50:02 bwelling Exp $ */
 
 #ifndef NS_OS_H
 #define NS_OS_H 1
@@ -23,7 +23,7 @@
 #include <isc/types.h>
 
 void
-ns_os_init(void);
+ns_os_init(const char *progname);
 
 void
 ns_os_daemonize(void);
diff --git a/bin/named/unix/os.c b/bin/named/unix/os.c
index 024b542838..d79508a4a4 100644
--- a/bin/named/unix/os.c
+++ b/bin/named/unix/os.c
@@ -15,7 +15,7 @@
  * SOFTWARE.
  */
 
-/* $Id: os.c,v 1.26 2000/07/08 00:12:21 bwelling Exp $ */
+/* $Id: os.c,v 1.27 2000/07/18 17:50:01 bwelling Exp $ */
 
 #include <config.h>
 
@@ -175,7 +175,7 @@ linux_keepcaps(void) {
 
 
 static void
-setup_syslog(void) {
+setup_syslog(const char *progname) {
 	int options;
 
 	options = LOG_PID;
@@ -183,12 +183,12 @@ setup_syslog(void) {
 	options |= LOG_NDELAY;
 #endif
 
-	openlog("named", options, LOG_DAEMON);
+	openlog(progname, options, LOG_DAEMON);
 }
 
 void
-ns_os_init(void) {
-	setup_syslog();
+ns_os_init(const char *progname) {
+	setup_syslog(progname);
 #ifdef HAVE_LINUX_CAPABILITY_H
 	linux_initialprivs();
 #endif