Fixed some lost externs in the tcpwrapper code

This commit is contained in:
Steve Dickson 2009-03-09 10:35:31 +00:00
parent 9a95968d9e
commit eaa6c2e5a6
2 changed files with 39 additions and 0 deletions

View File

@ -0,0 +1,34 @@
commit 06da4cfd46942acaaa5bd2e7933fd290701d186d
Author: Steve Dickson <steved@redhat.com>
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 <jue@jue.li>
Signed-off-by: Steve Dickson <steved@redhat.com>
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

View File

@ -26,6 +26,8 @@ Patch00: nfs-utils-1.0.5-statdpath.patch
Patch01: nfs-utils-1.1.0-smnotify-path.patch Patch01: nfs-utils-1.1.0-smnotify-path.patch
Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
Patch100: nfs-utils-1.1.5-tcpwrap-externs.patch
%if %{enablefscache} %if %{enablefscache}
Patch90: nfs-utils-1.1.0-mount-fsc.patch Patch90: nfs-utils-1.1.0-mount-fsc.patch
%endif %endif
@ -79,6 +81,8 @@ This package also contains the mount.nfs and umount.nfs program.
%patch01 -p1 %patch01 -p1
%patch02 -p1 %patch02 -p1
%patch100 -p1
%if %{enablefscache} %if %{enablefscache}
%patch90 -p1 %patch90 -p1
%endif %endif
@ -243,6 +247,7 @@ fi
%changelog %changelog
* Fri Mar 6 2009 Steve Dickson <steved@redhat.com> 1.1.5-2 * Fri Mar 6 2009 Steve Dickson <steved@redhat.com> 1.1.5-2
- Fixed lockd not using settings in sysconfig/nfs (bz 461043) - Fixed lockd not using settings in sysconfig/nfs (bz 461043)
- Fixed some lost externs in the tcpwrapper code
* Thu Mar 5 2009 Steve Dickson <steved@redhat.com> 1.1.5-1 * Thu Mar 5 2009 Steve Dickson <steved@redhat.com> 1.1.5-1
- Updated to latest upstream version: 1.1.5 - Updated to latest upstream version: 1.1.5