From 7ab4fcfdbc9c4b4aa040643dcff12530e6229e32 Mon Sep 17 00:00:00 2001
From: Simo Sorce <simo@fedoraproject.org>
Date: Jun 18 2007 15:56:42 +0000
Subject: Actually reverse the test, better to check for 0 than just one of the possible

error conditions.

---

diff --git a/samba.spec b/samba.spec
index b191241..eedab8a 100644
--- a/samba.spec
+++ b/samba.spec
@@ -392,7 +392,9 @@ NEWPATH="/var/lib/samba"
 eval ls $OLDPATH/*.tdb >/dev/null 2>&1
 if [ $? = 0 ]; then
     eval testparm -s 2>/dev/null |grep "lock dir" >/dev/null
-    if [ $? = 1 ]; then #lock dir option not specified, proceed with the move
+    if [ $? = 0 ]; then 
+	echo "Warning: lock dir explicitly set. Not moving tdb files to new default location"
+    else
 
 	#Stop daemons before we move the files around
 
@@ -435,8 +437,6 @@ if [ $? = 0 ]; then
 	mv -f $OLDPATH/perfmon $NEWPATH/ >/dev/null 2>&1
 	mv -f $OLDPATH/printing $NEWPATH/ >/dev/null 2>&1
 
-    else
-	echo "Warning: lock dir explicitly set. Not moving tdb files to new default location"
     fi
 fi
 
@@ -446,39 +446,39 @@ fi
 #secrets.tdb
 if [ -f %{_sysconfdir}/samba/secrets.tdb ]; then
 	eval testparm -s 2>/dev/null |grep "private dir" >/dev/null
-	if [ $? = 1 ]; then #private dir option not specified, proceed with the move
+	if [ $? = 0 ]; then
+		echo "Warning: private dir explicitly set. Not moving secrets.tdb to new default location"
+	else
 		if [ -f /var/lib/samba/private/secrets.tdb ]; then
 			mv -f /var/lib/samba/private/secrets.tdb /var/lib/samba/private/secrets.tdb.old
 		fi
 		mv -f %{_sysconfdir}/samba/secrets.tdb /var/lib/samba/private/secrets.tdb
-	else
-		echo "Warning: private dir explicitly set. Not moving secrets.tdb to new default location"
 	fi
 fi
 
 #smbpasswd
 if [ -f %{_sysconfdir}/samba/smbpasswd ]; then
 	eval testparm -s 2>/dev/null |grep "smb passwd file" >/dev/null
-	if [ $? = 1 ]; then #smb passwd file option not specified, proceed with the move
+	if [ $? = 0 ]; then
+		echo "Warning: smbpasswd file location explicitly set. Not moving smbpasswd to new default location"
+	else
 		if [ -f /var/lib/samba/private/smbpasswd ]; then
 			mv -f /var/lib/samba/private/smbpasswd /var/lib/samba/private/smbpasswd.old
 		fi
 		mv -f %{_sysconfdir}/samba/smbpasswd /var/lib/samba/private/smbpasswd
-	else
-		echo "Warning: smbpasswd file location explicitly set. Not moving smbpasswd to new default location"
 	fi
 fi
 
 #passdb.tdb
 if [ -f %{_sysconfdir}/samba/passdb.tdb ]; then
 	eval testparm -s 2>/dev/null |grep "private dir" >/dev/null || testparm -s 2>/dev/null |grep -P "^\s*passdb\s*backend\s*=.*tdbsam:/etc/samba/passdb.tdb.*"
-	if [ $? = 1 ]; then #private dir option not specified, proceed with the move
+	if [ $? = 0 ]; then
+		echo "Warning: passdb.tdb location explicitly set. Not moving passdb.tdb to new default location"
+	else
 		if [ -f /var/lib/samba/private/passdb.tdb ]; then
 			mv -f /var/lib/samba/private/passdb.tdb /var/lib/samba/private/passdb.tdb.old
 		fi
 		mv -f %{_sysconfdir}/samba/passdb.tdb /var/lib/samba/private/passdb.tdb
-	else
-		echo "Warning: passdb.tdb location explicitly set. Not moving passdb.tdb to new default location"
 	fi
 fi