rpms/ypserv/FC-6 ypserv-2.13-nonedomain.patch, NONE, 1.1 ypserv-2.19-quieter.patch, NONE, 1.1 ypserv.spec, 1.34, 1.35

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/ypserv/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11952

Modified Files:
	ypserv.spec 
Added Files:
	ypserv-2.13-nonedomain.patch ypserv-2.19-quieter.patch 
Log Message:
- Made ypserver less verbose on common errors (bz #199236)
- Don't allow a make for empty domainname's or domainname's set to (none)
  (bz #197646)



ypserv-2.13-nonedomain.patch:
 ypMakefile.in |    8 ++++++++
 1 files changed, 8 insertions(+)

--- NEW FILE ypserv-2.13-nonedomain.patch ---
--- ypserv-2.13/scripts/ypMakefile.in.nonedomain	2006-10-13 17:27:48.000000000 -0500
+++ ypserv-2.13/scripts/ypMakefile.in	2006-10-13 17:36:22.000000000 -0500
@@ -98,10 +98,18 @@ NETMASKS    = $(YPSRCDIR)/netmasks
 YPSERVERS = $(YPDIR)/ypservers	# List of all NIS servers for a domain
 
 target: Makefile
+ifeq    ($(shell /bin/domainname), (none))
+	@echo "Domain name cannot be (none)"
+else
+  ifeq ($(shell /bin/domainname), )
+	@echo "Domain name must be set"
+	else
 	@test ! -d $(LOCALDOMAIN) && mkdir $(LOCALDOMAIN) ; \
 	cd $(LOCALDOMAIN)  ; \
 	$(NOPUSH) || $(MAKE) -f ../Makefile ypservers; \
 	$(MAKE) -f ../Makefile all
+  endif
+endif
 
 # If you don't want some of these maps built, feel free to comment
 # them out from this list.

ypserv-2.19-quieter.patch:
 access.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE ypserv-2.19-quieter.patch ---
--- ypserv-2.19/lib/access.c.orig	2006-12-22 11:48:28.080930000 -0500
+++ ypserv-2.19/lib/access.c	2006-12-22 11:49:35.560015000 -0500
@@ -201,8 +201,8 @@ is_valid (struct svc_req *rqstp, const c
     }
   else
     {
-      if (status < 1 && ((sin->sin_addr.s_addr != oldaddr)
-			 || (status != oldstatus)))
+      if ((status < 1 && status != -4) &&
+		((sin->sin_addr.s_addr != oldaddr) || (status != oldstatus)))
 	syslog (LOG_WARNING,
 		"refused connect from %s:%d to procedure %s (%s,%s;%d)\n",
 		inet_ntoa (sin->sin_addr), ntohs (sin->sin_port),


Index: ypserv.spec
===================================================================
RCS file: /cvs/dist/rpms/ypserv/FC-6/ypserv.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ypserv.spec	13 Sep 2006 13:30:49 -0000	1.34
+++ ypserv.spec	22 Dec 2006 17:03:18 -0000	1.35
@@ -4,7 +4,7 @@
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.19
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -21,6 +21,9 @@
 Patch6: ypserv-2.13-yplib-memleak.patch
 Patch7: ypserv-2.13-ypxfr-zeroresp.patch
 Patch8: ypserv-2.19-inval-ports.patch
+Patch9: ypserv-2.13-nonedomain.patch
+Patch10: ypserv-2.19-quieter.patch
+
 Obsoletes: yppasswd
 BuildRequires: gdbm-devel
 Buildroot: %{_tmppath}/%{name}-root
@@ -43,14 +46,16 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .redhat
-%patch1 -p1 -b .path
-%patch2 -p1 -b .nfsnobody
-%patch3 -p1 -b .nomap
-%patch4 -p1 -b .iface
-%patch6 -p1 -b .memleak
-%patch7 -p1 -b .respzero
-%patch8 -p1 -b .ports
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %build
 cp etc/README etc/README.etc
@@ -136,6 +141,11 @@
 %{_includedir}/*/*
 
 %changelog
+* Fri Dec 22 2006 Steve Dickson <steved at redhat.com> - 2.19-4
+- Made ypserver less verbose on common errors (bz #199236)
+- Don't allow a make for empty domainname's or domainname's set to (none)
+  (bz #197646)
+
 * Wed Sep 13 2006 Steve Dickson <steved at redhat.com> - 2.19-3
 - Added range checks to port values given on command line 
   (bz 205354)