From 4e327468efddaae31610c3921c2e7825c8ea8fca Mon Sep 17 00:00:00 2001
From: Daniel Novotny <dnovotny@fedoraproject.org>
Date: Nov 04 2008 14:12:12 +0000
Subject: only "localhost" and "localdomain" username changes in .amandahosts


---

diff --git a/amanda.spec b/amanda.spec
index 12425f1..b854801 100644
--- a/amanda.spec
+++ b/amanda.spec
@@ -11,7 +11,7 @@
 Summary: A network-capable tape backup solution
 Name: amanda
 Version: 2.5.2p1
-Release: 12%{?dist}
+Release: 13%{?dist}
 Source: http://download.sourceforge.net/amanda/amanda-%{version}.tar.gz
 Source1: amanda.crontab
 Source4: disklist
@@ -184,9 +184,14 @@ mv /var/spool/cron/amanda /var/spool/cron/%amanda_user &>/dev/null
 %post
 /sbin/ldconfig
 # when upgrading and .amandahosts contains obsolete user name, update it
+# in localhost and localhost.localdomain entries
 [ $1 -eq 2 ] &&
-grep -E '^[^[:blank:]]+[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null &&
-	sed -i.usernameupdate -r -e 's/^([^[:blank:]]+[[:blank:]]+)amanda([[:blank:]].*)?$/\1%amanda_user\2/' /var/lib/amanda/.amandahosts || :
+grep -E '^localhost[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null &&
+	sed -i.usernameupdate -r -e 's/^(localhost[[:blank:]]+)amanda([[:blank:]].*)?$/\1%amanda_user\2/' /var/lib/amanda/.amandahosts || :
+
+[ $1 -eq 2 ] &&
+grep -E '^localhost\.localdomain[[:blank:]]+amanda([[:blank:]].*)?$' /var/lib/amanda/.amandahosts &>/dev/null &&
+	sed -i.usernameupdate -r -e 's/^(localhost\.localdomain[[:blank:]]+)amanda([[:blank:]].*)?$/\1%amanda_user\2/' /var/lib/amanda/.amandahosts || :
 
 %post client
 /sbin/ldconfig
@@ -366,6 +371,10 @@ grep -l -E '^dumpuser[[:blank:]]*"amanda"' /etc/amanda/*/amanda.conf |
 %{_libdir}/libamandad.so
 
 %changelog
+* Tue Nov 04 2008 Daniel Novotny <dnovotny@redhat.com> 2.5.2.p1-13
+- %%post script changed, only "localhost" and "localdomain"
+  username changes in .amandahosts
+
 * Wed Oct 15 2008 Daniel Novotny <dnovotny@redhat.com> 2.5.2.p1-12
 - --with-tcpportrange removed again (people getting AVC denies, #462681)
   #448071 re-solved with amanda.conf patch