commit yast2-iscsi-client for openSUSE:Factory

10 May 2016

Hello community,

here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at 2016-05-10 09:24:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-iscsi-client (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-iscsi-client"

Changes:
--------

--- /work/SRC/openSUSE:Factory/yast2-iscsi-client/yast2-iscsi-client.changes	2016-03-16 10:26:03.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-iscsi-client.new/yast2-iscsi-client.changes	2016-05-10 09:24:45.000000000 +0200
@@ -1,0 +2,7 @@
+Tue May  3 14:01:09 CEST 2016 - gs@suse.de
+
+- set user and password correctly for global authentication
+  (bsc#978183), improve error handling (bsc#959292)
+- 3.1.27
+
+-------------------------------------------------------------------

Old:
----
  yast2-iscsi-client-3.1.26.tar.bz2

New:
----
  yast2-iscsi-client-3.1.27.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-iscsi-client.spec ++++++
--- /var/tmp/diff_new_pack.PLSKS8/_old	2016-05-10 09:24:46.000000000 +0200
+++ /var/tmp/diff_new_pack.PLSKS8/_new	2016-05-10 09:24:46.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-iscsi-client
-Version:        3.1.26
+Version:        3.1.27
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

++++++ yast2-iscsi-client-3.1.26.tar.bz2 -> yast2-iscsi-client-3.1.27.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.26/package/yast2-iscsi-client.changes new/yast2-iscsi-client-3.1.27/package/yast2-iscsi-client.changes
--- old/yast2-iscsi-client-3.1.26/package/yast2-iscsi-client.changes	2016-03-10 13:34:43.000000000 +0100
+++ new/yast2-iscsi-client-3.1.27/package/yast2-iscsi-client.changes	2016-05-04 14:54:30.000000000 +0200
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Tue May  3 14:01:09 CEST 2016 - gs@suse.de
+
+- set user and password correctly for global authentication
+  (bsc#978183), improve error handling (bsc#959292)
+- 3.1.27
+
+-------------------------------------------------------------------
 Thu Mar 10 09:19:54 CET 2016 - gs@suse.de
 
 - show correct error message if host name isn't found (bsc#959292)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.26/package/yast2-iscsi-client.spec new/yast2-iscsi-client-3.1.27/package/yast2-iscsi-client.spec
--- old/yast2-iscsi-client-3.1.26/package/yast2-iscsi-client.spec	2016-03-10 13:34:43.000000000 +0100
+++ new/yast2-iscsi-client-3.1.27/package/yast2-iscsi-client.spec	2016-05-04 14:54:30.000000000 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-iscsi-client
-Version:        3.1.26
+Version:        3.1.27
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.26/src/include/iscsi-client/widgets.rb new/yast2-iscsi-client-3.1.27/src/include/iscsi-client/widgets.rb
--- old/yast2-iscsi-client-3.1.26/src/include/iscsi-client/widgets.rb	2016-03-10 13:34:43.000000000 +0100
+++ new/yast2-iscsi-client-3.1.27/src/include/iscsi-client/widgets.rb	2016-05-04 14:54:30.000000000 +0200
@@ -574,19 +574,21 @@
           return false
         end
         if !IP.Check(ip)
-          # check for valid host name (take only first line of 'host'
-          # output because with IPv6 there might be several lines)
+          # check for valid host name
           result =  SCR.Execute( path(".target.bash_output"),
-              "LC_ALL=POSIX host #{ip}|head -1|tr -d '\n'")
+                                 "LC_ALL=POSIX host #{ip}")
+          Builtins.y2milestone("Cmd: host %1, result: %2", ip, result)
           output = result["stdout"] || ""
-          Builtins.y2milestone("%1", output)
 
-          if (result["exit"] != 0) || output.include?("not found:")
-            Popup.Error(_("Please check IP address resp. host name.\n") + "#{output}")
+          if (result["exit"] != 0)
+            Popup.Error(_("Please check IP address resp. host name.\n") + "#{output}" + "#{result["stderr"]}")
             UI.SetFocus(:hostname)
             return false
           elsif !output.empty?
-            ip = output.split(" ").last
+            # take only first line of 'host' output because with IPv6
+            # there might be several lines
+            ip_info = output.split("\n").first
+            ip = ip_info.split(" ").last
           end
         end
         # validate port number
@@ -605,7 +607,7 @@
        ip = "[#{ip}]" # brackets needed around IPv6
       end
 
-      # store old config
+      # store /etc/iscsi/iscsi.conf
       IscsiClientLib.getConfig
 
       auth_none = Convert.to_boolean(UI.QueryWidget(Id(:auth_none), :Value))
@@ -633,11 +635,10 @@
         pass_out = ""
       end
 
-      # write authentication data
+      # temporarily write authentication data to /etc/iscsi/iscsi.conf
       IscsiClientLib.saveConfig(user_in, pass_in, user_out, pass_out)
-      #y2internal("auth: %1/%2, %3/%4", user_in, pass_in, user_out, pass_out);
+
       @bg_finish = false
-      # ` with authentication
 
       # Check @current_tab (dialogs.rb) here. If it's "client", i.e. the
       # 'Add' button at 'Connected Targets' is used, create discovery
@@ -662,7 +663,7 @@
         end
       end
       IscsiClientLib.targets = IscsiClientLib.ScanDiscovered(trg_list)
-      # restore old config
+      # restore saved config
       IscsiClientLib.oldConfig
 
       @stat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.26/src/modules/IscsiClientLib.rb new/yast2-iscsi-client-3.1.27/src/modules/IscsiClientLib.rb
--- old/yast2-iscsi-client-3.1.26/src/modules/IscsiClientLib.rb	2016-03-10 13:34:43.000000000 +0100
+++ new/yast2-iscsi-client-3.1.27/src/modules/IscsiClientLib.rb	2016-05-04 14:54:30.000000000 +0200
@@ -418,17 +418,28 @@
       tmp_conf = deep_copy(@config)
       tmp_val = Ops.get_list(tmp_conf, "value", [])
 
-      if Ops.greater_than(Builtins.size(user_in), 0) &&
-          Ops.greater_than(Builtins.size(pass_in), 0)
-        tmp_val = setOrAdd(tmp_val, "node.session.auth.username", user_in)
-        tmp_val = setOrAdd(tmp_val, "node.session.auth.password", pass_in)
+      if (specified = !user_in.empty? && !pass_in.empty?)
+        tmp_val = setOrAdd(
+          tmp_val,
+          "discovery.sendtargets.auth.authmethod",
+          "CHAP"
+        )
+        tmp_val = setOrAdd(
+          tmp_val,
+          "discovery.sendtargets.auth.username_in",
+          user_in
+        )
+        tmp_val = setOrAdd(
+          tmp_val,
+          "discovery.sendtargets.auth.password_in",
+          pass_in
+        )
       else
-        tmp_val = delete(tmp_val, "node.session.auth.username")
-        tmp_val = delete(tmp_val, "node.session.auth.password")
+        tmp_val = delete(tmp_val, "discovery.sendtargets.auth.username_in")
+        tmp_val = delete(tmp_val, "discovery.sendtargets.auth.password_in")
       end
 
-      if Ops.greater_than(Builtins.size(user_out), 0) &&
-          Ops.greater_than(Builtins.size(pass_out), 0)
+      if (specified = !user_out.empty? && !pass_out.empty?)
         tmp_val = setOrAdd(
           tmp_val,
           "discovery.sendtargets.auth.authmethod",
@@ -445,10 +456,14 @@
           pass_out
         )
       else
-        tmp_val = delete(tmp_val, "discovery.sendtargets.auth.authmethod")
         tmp_val = delete(tmp_val, "discovery.sendtargets.auth.username")
         tmp_val = delete(tmp_val, "discovery.sendtargets.auth.password")
       end
+
+      if user_in.empty? && user_out.empty?
+        tmp_val = delete(tmp_val, "discovery.sendtargets.auth.authmethod")
+      end
+
       Ops.set(tmp_conf, "value", tmp_val)
       SCR.Write(path(".etc.iscsid.all"), tmp_conf)
       SCR.Write(path(".etc.iscsid"), nil)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-iscsi-client-3.1.26/test/saveConfig_spec.rb new/yast2-iscsi-client-3.1.27/test/saveConfig_spec.rb
--- old/yast2-iscsi-client-3.1.26/test/saveConfig_spec.rb	2016-03-10 13:34:43.000000000 +0100
+++ new/yast2-iscsi-client-3.1.27/test/saveConfig_spec.rb	2016-05-04 14:54:30.000000000 +0200
@@ -247,23 +247,23 @@
           {
             "comment" => "",
             "kind" => "value",
-            "name" => "node.session.auth.username",
+            "name" => "discovery.sendtargets.auth.authmethod",
             "type" => 1,
-            "value" => "incuser"
+            "value" => "CHAP"
           },
           {
             "comment" => "",
             "kind" => "value",
-            "name" => "node.session.auth.password",
+            "name" => "discovery.sendtargets.auth.username_in",
             "type" => 1,
-            "value" => "incpass"
+            "value" => "incuser"
           },
           {
             "comment" => "",
             "kind" => "value",
-            "name" => "discovery.sendtargets.auth.authmethod",
+            "name" => "discovery.sendtargets.auth.password_in",
             "type" => 1,
-            "value" => "CHAP"
+            "value" => "incpass"
           },
           {
             "comment" => "",

    

commit yast2-iscsi-client for openSUSE:Factory

root＠hilbert.suse.de