Fixed empty domain handling in ypinit script

Resolves: #751427

ypserv-2.24-aliases.patch

@@ -1,12 +1,12 @@
-diff -up ypserv-2.24/configure.in.aliases ypserv-2.24/configure.in
---- ypserv-2.24/configure.in.aliases	2011-05-06 11:57:05.745509195 +0200
-+++ ypserv-2.24/configure.in	2011-05-06 11:57:16.327509192 +0200
-@@ -149,7 +149,7 @@ fi
- AC_SUBST(MAKE)
- 
- dnl Check for aliases path
--AC_PATH_PROG(ALIASES, aliases, /etc/mail/aliases, /etc/mail:/etc)
-+AC_PATH_PROG(ALIASES, aliases, /etc/aliases, /etc/mail:/etc)
- 
- 
- 
+diff -up ypserv-2.24/scripts/ypMakefile.in.aliases ypserv-2.24/scripts/ypMakefile.in
+--- ypserv-2.24/scripts/ypMakefile.in.aliases	2011-05-12 13:37:08.334767478 +0200
++++ ypserv-2.24/scripts/ypMakefile.in	2011-05-12 13:38:40.475615560 +0200
+@@ -75,7 +75,7 @@ SHADOW	    = $(YPPWDDIR)/shadow
+ GSHADOW     = $(YPPWDDIR)/gshadow
+ ADJUNCT     = $(YPPWDDIR)/passwd.adjunct
+ #ALIASES     = $(YPSRCDIR)/aliases  # aliases could be in /etc or /etc/mail
+-ALIASES     = @ALIASES@
++ALIASES     = /etc/aliases
+ ETHERS      = $(YPSRCDIR)/ethers     # ethernet addresses (for rarpd)
+ BOOTPARAMS  = $(YPSRCDIR)/bootparams # for booting Sun boxes (bootparamd)
+ HOSTS       = $(YPSRCDIR)/hosts

ypserv-2.24-emptydomain.patch

@@ -0,0 +1,12 @@
+diff -up ypserv-2.24/scripts/ypinit.in.emptydomain ypserv-2.24/scripts/ypinit.in
+--- ypserv-2.24/scripts/ypinit.in.emptydomain	2001-11-26 21:02:49.000000000 +0100
++++ ypserv-2.24/scripts/ypinit.in	2011-11-28 10:56:54.272418093 +0100
+@@ -156,7 +156,7 @@ then
+ 	exit 1
+ fi
+ 
+-if [ -z "$DOMAIN" ]
++if [ "${DOMAIN}x" = "x" ] || [ "${DOMAIN}" = "(none)" ]
+ then
+ 	echo "The local host's domain name hasn't been set.  Please set it."
+ 	exit 1

ypserv-2.26-emptydomain.patch

@@ -0,0 +1,12 @@
+diff -up ypserv-2.26/scripts/ypinit.in.emptydomain ypserv-2.26/scripts/ypinit.in
+--- ypserv-2.26/scripts/ypinit.in.emptydomain	2011-11-24 09:12:31.267702768 +0100
++++ ypserv-2.26/scripts/ypinit.in	2011-11-24 09:13:09.881700121 +0100
+@@ -156,7 +156,7 @@ then
+ 	exit 1
+ fi
+ 
+-if [ -z "$DOMAIN" ]
++if [ "${DOMAIN}x" = "x" ] || [ "${DOMAIN}" = "(none)" ]
+ then
+ 	echo "The local host's domain name hasn't been set.  Please set it."
+ 	exit 1

ypserv.spec

@@ -2,7 +2,7 @@ Summary: The NIS (Network Information Service) server
 Url: http://www.linux-nis.org/nis/ypserv/index.html
 Name: ypserv
 Version: 2.24
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source0: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypserv-%{version}.tar.bz2
@@ -27,6 +27,7 @@ Patch6: ypserv-2.19-slp-warning.patch
 Patch7: ypserv-2.24-staticanal.patch
 Patch8: ypserv-2.24-manfix.patch
 Patch9: ypserv-2.24-aliases.patch
+Patch10: ypserv-2.24-emptydomain.patch
 BuildRequires: gdbm-devel
 
 %description
@@ -57,6 +58,7 @@ machines.
 %patch7 -p1 -b .staticanal
 %patch8 -p1 -b .manfix
 %patch9 -p1 -b .aliases
+%patch10 -p1 -b .emptydomain
 
 %build
 cp etc/README etc/README.etc
@@ -138,6 +140,14 @@ exit 0
 %{_includedir}/*/*
 
 %changelog
+* Mon Nov 28 2011 Honza Horak <hhorak@redhat.com> - 2.24-6
+- Fixed empty domain handling in ypinit script
+  Resolves: #751427
+
+* Thu May 12 2011 Honza Horak <hhorak@redhat.com> - 2.24-5
+- Changed the way how path is set in the previous change 
+  (#699826)
+
 * Fri May 06 2011 Honza Horak <hhorak@redhat.com> - 2.24-4
 - Change default aliases file location to /etc/aliases to correspond 
   with default MTAs' config (#699826)