From eaa6c2e5a63f75f2560f7b51f7e3d19aaf6033f9 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Mon, 9 Mar 2009 10:35:31 +0000 Subject: [PATCH] Fixed some lost externs in the tcpwrapper code --- nfs-utils-1.1.5-tcpwrap-externs.patch | 34 +++++++++++++++++++++++++++ nfs-utils.spec | 5 ++++ 2 files changed, 39 insertions(+) create mode 100644 nfs-utils-1.1.5-tcpwrap-externs.patch diff --git a/nfs-utils-1.1.5-tcpwrap-externs.patch b/nfs-utils-1.1.5-tcpwrap-externs.patch new file mode 100644 index 0000000..0a429c7 --- /dev/null +++ b/nfs-utils-1.1.5-tcpwrap-externs.patch @@ -0,0 +1,34 @@ +commit 06da4cfd46942acaaa5bd2e7933fd290701d186d +Author: Steve Dickson +Date: Sun Mar 8 10:10:25 2009 -0400 + + Added back the some logging variables which are no + longer used but, unfortunately, they are extern-ed by + public headers files which are not under the control + of this package. + + Spotted-by: Juergen Daubert + Signed-off-by: Steve Dickson + +diff --git a/support/misc/tcpwrapper.c b/support/misc/tcpwrapper.c +index a361496..1da6020 100644 +--- a/support/misc/tcpwrapper.c ++++ b/support/misc/tcpwrapper.c +@@ -60,8 +60,16 @@ static void logit(int severity, struct sockaddr_in *addr, + u_long procnum, u_long prognum, char *text); + static int check_files(void); + ++/* ++ * These need to exist since they are externed ++ * in public header files. ++ */ ++int verboselog = 0; ++int allow_severity = LOG_INFO; ++int deny_severity = LOG_WARNING; ++ + #define log_bad_host(addr, proc, prog) \ +- logit(LOG_WARNING, addr, proc, prog, "request from unauthorized host") ++ logit(deny_severity, addr, proc, prog, "request from unauthorized host") + + #define ALLOW 1 + #define DENY 0 diff --git a/nfs-utils.spec b/nfs-utils.spec index cce28fe..dce33b1 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -26,6 +26,8 @@ Patch00: nfs-utils-1.0.5-statdpath.patch Patch01: nfs-utils-1.1.0-smnotify-path.patch Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch +Patch100: nfs-utils-1.1.5-tcpwrap-externs.patch + %if %{enablefscache} Patch90: nfs-utils-1.1.0-mount-fsc.patch %endif @@ -79,6 +81,8 @@ This package also contains the mount.nfs and umount.nfs program. %patch01 -p1 %patch02 -p1 +%patch100 -p1 + %if %{enablefscache} %patch90 -p1 %endif @@ -243,6 +247,7 @@ fi %changelog * Fri Mar 6 2009 Steve Dickson 1.1.5-2 - Fixed lockd not using settings in sysconfig/nfs (bz 461043) +- Fixed some lost externs in the tcpwrapper code * Thu Mar 5 2009 Steve Dickson 1.1.5-1 - Updated to latest upstream version: 1.1.5