rpms/nfs-utils/devel nfs-utils-1.1.5-tcpwrap-externs.patch, NONE, 1.1 nfs-utils.spec, 1.218, 1.219

[Steve Dickson]

Author: steved

Update of /cvs/pkgs/rpms/nfs-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27676

Modified Files:
	nfs-utils.spec 
Added Files:
	nfs-utils-1.1.5-tcpwrap-externs.patch 
Log Message:
Fixed some lost externs in the tcpwrapper code



nfs-utils-1.1.5-tcpwrap-externs.patch:

--- NEW FILE nfs-utils-1.1.5-tcpwrap-externs.patch ---
commit 06da4cfd46942acaaa5bd2e7933fd290701d186d
Author: Steve Dickson <steved at 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 at jue.li>
    Signed-off-by: Steve Dickson <steved at 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


Index: nfs-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nfs-utils/devel/nfs-utils.spec,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- nfs-utils.spec	6 Mar 2009 12:31:05 -0000	1.218
+++ nfs-utils.spec	9 Mar 2009 10:35:31 -0000	1.219
@@ -26,6 +26,8 @@
 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 @@
 %patch01 -p1
 %patch02 -p1
 
+%patch100 -p1
+
 %if %{enablefscache}
 %patch90 -p1
 %endif
@@ -243,6 +247,7 @@
 %changelog
 * Fri Mar  6 2009 Steve Dickson <steved at redhat.com> 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 <steved at redhat.com> 1.1.5-1
 - Updated to latest upstream version: 1.1.5