From 0627c213d9d105600af298147d9e7132a312c734 Mon Sep 17 00:00:00 2001
From: Andy Grover <agrover@redhat.com>
Date: Apr 16 2013 20:05:15 +0000
Subject: update to 0.3.1-5


Signed-off-by: Andy Grover <agrover@redhat.com>

---

diff --git a/targetd-require-password.patch b/targetd-require-password.patch
index 1c28ff8..c2db299 100644
--- a/targetd-require-password.patch
+++ b/targetd-require-password.patch
@@ -1,13 +1,13 @@
-commit dcd48f3252d1accec2f11571968b4ce0a01be23f
+commit bf6e05e1ebb3e36de4e1e5641046a6adc648dd5b
 Author: Andy Grover <agrover@redhat.com>
-Date:   Tue Apr 16 12:08:47 2013 -0700
+Date:   Tue Apr 16 12:59:31 2013 -0700
 
     Fail if password not set in config file
     
     Signed-off-by: Andy Grover <agrover@redhat.com>
 
 diff --git a/targetd b/targetd
-index 9e85e16..632714a 100755
+index 9e85e16..cd5cb2b 100755
 --- a/targetd
 +++ b/targetd
 @@ -43,7 +43,7 @@ config_path = "/etc/target/targetd.yaml"
@@ -23,7 +23,7 @@ index 9e85e16..632714a 100755
      print "targetd must run as root."
      sys.exit(-1)
  
-+if 'password' not in config:
++if not config.get('password', None):
 +    print "password not set in %s, aborting" % config_path
 +    sys.exit(-1)
 +
diff --git a/targetd.spec b/targetd.spec
index 4c36424..01c0e9f 100644
--- a/targetd.spec
+++ b/targetd.spec
@@ -3,7 +3,7 @@ License:        GPLv3
 Group:          System Environment/Libraries
 Summary:        Service to make storage remotely configurable
 Version:        0.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 URL:            https://github.com/agrover/targetd
 Source:         https://github.com/downloads/agrover/%{name}/%{name}-%{version}.tar.gz
 Source1:        targetd.service
@@ -70,6 +70,10 @@ fi
 %config(noreplace) %{_sysconfdir}/target/targetd.yaml
 
 %changelog
+* Tue Apr 16 2013 Andy Grover <agrover@redhat.com> - 0.3.1-5
+- Update require-password.patch
+- Change target.yaml to not include a commented-out default password
+
 * Tue Apr 16 2013 Andy Grover <agrover@redhat.com> - 0.3.1-4
 - Remove dependency on python-tlslite
 
diff --git a/targetd.yaml b/targetd.yaml
index dd7bf67..24836aa 100644
--- a/targetd.yaml
+++ b/targetd.yaml
@@ -1,8 +1,11 @@
 # See http://www.yaml.org/spec/1.2/spec.html for more on YAML.
 
+# No default password, please pick a good one.
+
+password:
+
 # defaults below; uncomment and edit
 #pool_name: vg-targetd
 #user: admin
-#password: targetd
 #ssl: false
 #target_name: iqn.2003-01.org.example.mach1:1234