Bsc1172340

package/yast2-auth-client.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov 24 10:53:05 UTC 2020 - Noel Power <nopower@suse.com>
+
+- Fix cli 'help' handling for auth-client & ldapkrb;
+  (bsc#1172340).
+- 4.3.2
+
 -------------------------------------------------------------------
 Mon Aug 10 17:01:10 CEST 2020 - schubi@suse.de
 

package/yast2-auth-client.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2-auth-client
-Version:        4.3.1
+Version:        4.3.2
 Release:        0
 Url:            https://github.com/yast/yast-auth-client
 Summary:        YaST2 - Centralised System Authentication Configuration

src/clients/auth-client.rb

@@ -21,7 +21,12 @@
 # Authors:      Howard Guo <hguo@suse.com>
 
 require 'auth/authconf'
+require 'auth/auth-cli'
 require 'authui/main_dialog'
 
-Auth::AuthConfInst.read_all
-Auth::MainDialog.new(:sssd).run
+if Yast::WFM.Args.empty?
+  Auth::AuthConfInst.read_all
+  Auth::MainDialog.new(:sssd).run
+else
+  Auth::CLI.run("auth-client")
+end

src/clients/ldapkrb.rb

@@ -21,7 +21,12 @@
 # Authors:      Howard Guo <hguo@suse.com>
 
 require 'auth/authconf'
+require 'auth/auth-cli'
 require 'authui/main_dialog'
 
-Auth::AuthConfInst.read_all
-Auth::MainDialog.new(:ldapkrb).run
+if Yast::WFM.Args.empty?
+  Auth::AuthConfInst.read_all
+  Auth::MainDialog.new(:ldapkrb).run
+else
+  Auth::CLI.run("ldapkrb")
+end

src/lib/auth/auth-cli.rb

@@ -0,0 +1,32 @@
+# Copyright (c) 2020 SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+Yast.import "CommandLine"
+module Auth
+  class CLI
+    extend Yast::I18n
+
+    def self.run(cmd="auth")
+      cmdline_description = {
+        "id"   => cmd
+      }
+      Yast::CommandLine.Run(cmdline_description)
+    end
+  end
+end

src/lib/authui/ldapkrb/main_dialog.rb

@@ -393,7 +393,7 @@ def render_ldap
             else
                 UI.ChangeWidget(Id(:ldap_bind_policy), :CurrentButton, :ldap_bind_policy_hard)
             end
-            if AuthConfInst.ldap_conf['ssl'] == 'on'
+            if AuthConfInst.ldap_conf['ssl'] == 'yes'
                 UI.ChangeWidget(Id(:ldap_tls_method), :CurrentButton, :ldap_tls_method_yes)
             elsif AuthConfInst.ldap_conf['ssl'] == 'start_tls'
                 UI.ChangeWidget(Id(:ldap_tls_method), :CurrentButton, :ldap_tls_method_starttls)