packages (AC-branch): postfix/postfix.spec - avoid filling empty domain

[glen]

Author: glen                         Date: Sat Jun  9 17:56:56 2012 GMT
Module: packages                      Tag: AC-branch
---- Log message:
- avoid filling empty domain

---- Files affected:
packages/postfix:
   postfix.spec (1.357.2.3 -> 1.357.2.4) 

---- Diffs:

================================================================
Index: packages/postfix/postfix.spec
diff -u packages/postfix/postfix.spec:1.357.2.3 packages/postfix/postfix.spec:1.357.2.4
--- packages/postfix/postfix.spec:1.357.2.3	Wed May 16 21:20:50 2012
+++ packages/postfix/postfix.spec	Sat Jun  9 19:56:51 2012
@@ -369,7 +369,7 @@
 	# postfix expects gethostname() to return FQDN, which is obviously wrong
 	if ! grep -qE "^my(domain|hostname)" %{_sysconfdir}/mail/main.cf; then
 		domain=$(/bin/hostname -d 2>/dev/null)
-		[ "$domain" != 'localdomain' ] && \
+		[ "$domain" -a "$domain" != 'localdomain' ] && \
 			postconf -e mydomain="$domain"
 	fi
 else
@@ -531,6 +531,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.357.2.4  2012/06/09 17:56:51  glen
+- avoid filling empty domain
+
 Revision 1.357.2.3  2012/05/16 19:20:50  glen
 - up to 2.7.9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/postfix/postfix.spec?r1=1.357.2.3&r2=1.357.2.4