From 47fb2919c70b5564390cb7a73f11715e5774c4cc Mon Sep 17 00:00:00 2001
From: Mark Buechler <mark.buechler@gmail.com>
Date: Wed, 25 Aug 2010 18:43:49 +0000
Subject: [PATCH] - Fix resetting a create/assignment attribute to default by  
 removing it from the config file. - Fix closing pass-through devices on
 clearConfig().

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@1992 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 scstadmin/scstadmin.sysfs/scstadmin | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin
index 991668728..f9a1fe972 100755
--- a/scstadmin/scstadmin.sysfs/scstadmin
+++ b/scstadmin/scstadmin.sysfs/scstadmin
@@ -1877,8 +1877,19 @@ sub compareToKeyAttribute {
 	my $second = shift;
 
 	foreach my $attr (keys %{$first}) {
-		next if (!defined($$second{$attr}->{'keys'}->{'0'}->{'value'}) && ($$first{$attr} == 0));
-		return TRUE if ($$first{$attr} ne $$second{$attr}->{'keys'}->{'0'}->{'value'});
+		if (defined($$second{$attr}->{'keys'})) {
+			next if (!defined($$second{$attr}->{'keys'}->{'0'}->{'value'}) && ($$first{$attr} == 0));
+			return TRUE if ($$first{$attr} ne $$second{$attr}->{'keys'}->{'0'}->{'value'});
+		} else {
+			next if (!defined($$second{$attr}->{'value'}) && ($$first{$attr} == 0));
+			return TRUE if ($$first{$attr} ne $$second{$attr}->{'value'});
+		}
+	}
+
+	foreach my $attr (keys %{$second}) {
+		if (defined($$second{$attr}->{'keys'}) && !defined($$first{$attr})) {
+			return TRUE;
+		}
 	}
 
 	return FALSE;
@@ -1913,9 +1924,7 @@ sub clearConfiguration {
 	foreach my $handler (sort keys %{$handlers}) {
 		foreach my $device (@{$$handlers{$handler}}) {
 			my $attributes = $SCST->deviceAttributes($device);
-			if (!defined($$attributes{'scsi_device'})) {
-				closeDevice($handler, $device, $force);
-			}
+			closeDevice($handler, $device, $force);
 		}
 	}