From 9611d05bb2eb3fd6d965d19ba3df740a156839cc Mon Sep 17 00:00:00 2001
From: ssorce <ssorce>
Date: Mon, 26 Mar 2007 21:13:03 +0000
Subject: [PATCH] make sure we force move the files remove eventual leftover in
 /etc/samba to clean it up

---
 samba.spec | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/samba.spec b/samba.spec
index a93c17b..13cd46d 100644
--- a/samba.spec
+++ b/samba.spec
@@ -438,27 +438,31 @@ fi
 #secrets.tdb
 if [ -f %{_sysconfdir}/samba/secrets.tdb ]; then
 	if [ -f /var/lib/samba/private/secrets.tdb ]; then
-		mv /var/lib/samba/private/secrets.tdb /var/lib/samba/private/secrets.tdb.old
+		mv -f /var/lib/samba/private/secrets.tdb /var/lib/samba/private/secrets.tdb.old
 	fi
-	mv %{_sysconfdir}/samba/secrets.tdb /var/lib/samba/private/secrets.tdb
+	mv -f %{_sysconfdir}/samba/secrets.tdb /var/lib/samba/private/secrets.tdb
 fi
 
 #smbpasswd
 if [ -f %{_sysconfdir}/samba/smbpasswd ]; then
 	if [ -f /var/lib/samba/private/smbpasswd ]; then
-		mv /var/lib/samba/private/smbpasswd /var/lib/samba/private/smbpasswd.old
+		mv -f /var/lib/samba/private/smbpasswd /var/lib/samba/private/smbpasswd.old
 	fi
-	mv %{_sysconfdir}/samba/smbpasswd /var/lib/samba/private/smbpasswd
+	mv -f %{_sysconfdir}/samba/smbpasswd /var/lib/samba/private/smbpasswd
 fi
 
 #passdb.tdb
 if [ -f %{_sysconfdir}/samba/passdb.tdb ]; then
 	if [ -f /var/lib/samba/private/passdb.tdb ]; then
-		mv /var/lib/samba/private/passdb.tdb /var/lib/samba/private/passdb.tdb.old
+		mv -f /var/lib/samba/private/passdb.tdb /var/lib/samba/private/passdb.tdb.old
 	fi
-	mv %{_sysconfdir}/samba/passdb.tdb /var/lib/samba/private/passdb.tdb
+	mv -f %{_sysconfdir}/samba/passdb.tdb /var/lib/samba/private/passdb.tdb
 fi
 
+#remove schannel_store if existing, it is not info we need to keep across restarts
+if [ -f %{_sysconfdir}/samba/schannel_store.tdb ]; then
+	rm -f %{_sysconfdir}/samba/schannel_store.tdb
+fi
 
 if [ "$1" -ge "1" ]; then
 	%{_initrddir}/winbind condrestart >/dev/null 2>&1