From cae90ac54fbe263881b4d4df1fec0ef221eb95fb Mon Sep 17 00:00:00 2001 From: obache Date: Wed, 29 Sep 2010 11:21:02 +0000 Subject: disable LOG_AUTHPRIV and LOG_FTP syslog facilities if it does not exist. rest part of PR#43921. --- net/nagios-nrpe/distinfo | 4 ++-- net/nagios-nrpe/patches/patch-aa | 24 +++++++++++++++++++++--- 2 files changed, 23 insertions(+), 5 deletions(-) (limited to 'net') diff --git a/net/nagios-nrpe/distinfo b/net/nagios-nrpe/distinfo index 660fa7619df..5f35d21a2bf 100644 --- a/net/nagios-nrpe/distinfo +++ b/net/nagios-nrpe/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2008/06/21 14:52:48 tonnerre Exp $ +$NetBSD: distinfo,v 1.5 2010/09/29 11:21:02 obache Exp $ SHA1 (nrpe-2.12.tar.gz) = 208595c175d726e8e377d565b21897f4de1648cc RMD160 (nrpe-2.12.tar.gz) = 3413f84c9bb926a4dd55cc02d7b0a01bd7fc99ee Size (nrpe-2.12.tar.gz) = 405725 bytes -SHA1 (patch-aa) = 0250746f7e0be5eb2f419fd7a3465ca66aacae94 +SHA1 (patch-aa) = f3861f83f45fc6bbfa9a21041c75e1428bf861e7 diff --git a/net/nagios-nrpe/patches/patch-aa b/net/nagios-nrpe/patches/patch-aa index 2ad3de43c17..3d3991bff17 100644 --- a/net/nagios-nrpe/patches/patch-aa +++ b/net/nagios-nrpe/patches/patch-aa @@ -1,8 +1,26 @@ -$NetBSD: patch-aa,v 1.2 2008/06/21 14:52:49 tonnerre Exp $ +$NetBSD: patch-aa,v 1.3 2010/09/29 11:21:02 obache Exp $ ---- src/nrpe.c.orig 2008-03-10 22:04:43.000000000 +0100 +* some platforms don't support LOG_AUTHPRIV and LOG_FTP syslog facility +* remove deprecated `errno` definition + +--- src/nrpe.c.orig 2008-03-10 21:04:43.000000000 +0000 +++ src/nrpe.c -@@ -1320,7 +1320,6 @@ int my_system(char *command,int timeout, +@@ -613,10 +613,14 @@ int get_log_facility(char *varvalue){ + log_facility=LOG_UUCP; + else if(!strcmp(varvalue,"cron")) + log_facility=LOG_CRON; ++#ifdef LOG_AUTHPRIV + else if(!strcmp(varvalue,"authpriv")) + log_facility=LOG_AUTHPRIV; ++#endif ++#ifdef LOG_FTP + else if(!strcmp(varvalue,"ftp")) + log_facility=LOG_FTP; ++#endif + else if(!strcmp(varvalue,"local0")) + log_facility=LOG_LOCAL0; + else if(!strcmp(varvalue,"local1")) +@@ -1320,7 +1324,6 @@ int my_system(char *command,int timeout, pid_t pid; int status; int result; -- cgit v1.2.3