From b52641e4fe099ef61e90c93ee3849472c9443a18 Mon Sep 17 00:00:00 2001
From: Marko Kreen <markokr@gmail.com>
Date: Wed, 17 Nov 2010 14:00:42 +0200
Subject: [PATCH] Sync syslog handling with libusual

---
 include/bouncer.h | 2 --
 lib               | 2 +-
 src/main.c        | 6 ++++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/bouncer.h b/include/bouncer.h
index ea00a55..0e59b4c 100644
--- a/include/bouncer.h
+++ b/include/bouncer.h
@@ -311,8 +311,6 @@ extern int cf_daemon;
 
 extern char *cf_config_file;
 extern char *cf_jobname;
-extern int cf_syslog;
-extern char *cf_syslog_facility;
 
 extern char *cf_unix_socket_dir;
 extern char *cf_listen_addr;
diff --git a/lib b/lib
index ab07cc3..6ab8fc1 160000
--- a/lib
+++ b/lib
@@ -1 +1 @@
-Subproject commit ab07cc3188da8ba1a449fde831741a00bb329bef
+Subproject commit 6ab8fc19041727d8d24427f2777263d30948c3dd
diff --git a/src/main.c b/src/main.c
index f2d3cea..1c1fa86 100644
--- a/src/main.c
+++ b/src/main.c
@@ -23,6 +23,7 @@
 #include "bouncer.h"
 
 #include <usual/signal.h>
+#include <usual/err.h>
 
 #include <getopt.h>
 
@@ -63,9 +64,7 @@ int cf_daemon = 0;
 int cf_pause_mode = P_NONE;
 int cf_shutdown = 0; /* 1 - wait for queries to finish, 2 - shutdown immediately */
 int cf_reboot = 0;
-int cf_syslog = 0;
 static char *cf_username = "";
-char *cf_syslog_facility = "daemon";
 char *cf_config_file = "";
 
 char *cf_listen_addr = NULL;
@@ -163,6 +162,7 @@ ConfElem bouncer_params[] = {
 {"reserve_pool_timeout",true, CF_INT, &cf_res_pool_timeout},
 {"syslog",		true, CF_INT, &cf_syslog},
 {"syslog_facility",	true, CF_STR, &cf_syslog_facility},
+{"syslog_ident",	true, CF_STR, &cf_syslog_ident},
 #ifndef WIN32
 {"user",		false, CF_STR, &cf_username},
 #endif
@@ -682,6 +682,8 @@ int main(int argc, char *argv[])
 		{NULL, 0, NULL, 0}
 	};
 
+	setprogname(basename(argv[0]));
+
 	/* parse cmdline */
 	while ((c = getopt_long(argc, argv, "qvhdVRu:", long_options, &long_idx)) != -1) {
 		switch (c) {
-- 
2.50.1