Merge pull request #84 from scabrero/SLE-12-SP5

Default bind_policy to 'soft' if not present in the config
yast · Feb 21, 2020 · 0a7999d · 0a7999d
2 parents b682f4b + 92ac0ff
commit 0a7999d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/package/yast2-auth-client.changes b/package/yast2-auth-client.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Jan 30 09:57:03 UTC 2020 - Samuel Cabrero <scabrero@suse.de>
+
+- Default bind_policy to 'soft' if not present in the config
+  (bsc#1162025).
+- 3.3.19
+
 -------------------------------------------------------------------
 Fri Nov  3 14:56:08 UTC 2017 - hguo@suse.com
 

diff --git a/package/yast2-auth-client.spec b/package/yast2-auth-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-auth-client
-Version:        3.3.18
+Version:        3.3.19
 Release:        0
 Url:            https://github.com/yast/yast-auth-client
 Summary:        YaST2 - Centralised System Authentication Configuration

diff --git a/src/lib/authui/ldapkrb/main_dialog.rb b/src/lib/authui/ldapkrb/main_dialog.rb
@@ -306,6 +306,12 @@ def save_ldap
             when :ldap_tls_method_starttls
                 AuthConfInst.ldap_conf['ssl'] = 'start_tls'
             end
+
+            # bsc#1162025: Default bind_policy to soft if not present.
+            if !AuthConfInst.ldap_conf.key?('bind_policy')
+              AuthConfInst.ldap_conf['bind_policy'] = 'soft'
+            end
+
             AuthConfInst.mkhomedir_pam = UI.QueryWidget(Id(:mkhomedir_enable), :Value)
         end