Skip white space only lines parsing krb5.conf (#116)

* Remove duplicated when clause $ rake package * Starting syntax check... src/lib/authui/ldapkrb/main_dialog.rb:169: warning: duplicated `when' clause with line 159 is ignored Signed-off-by: Samuel Cabrero <scabrero@suse.de> * Skip whitespace-only lines parsing krb5.conf Signed-off-by: Samuel Cabrero <scabrero@suse.de> * Bump version to 3.3.21 Signed-off-by: Samuel Cabrero <scabrero@suse.de> --------- Signed-off-by: Samuel Cabrero <scabrero@suse.de>
yast · Sep 14, 2023 · 7ae6774 · 7ae6774
1 parent 68f8ee1
commit 7ae6774
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/package/yast2-auth-client.changes b/package/yast2-auth-client.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Sep 13 10:04:35 UTC 2023 - Samuel Cabrero <scabrero@suse.de>
+
+- Skip whitespace-only lines parsing krb5.conf; (bsc#1215297);
+- 3.3.21
+
 -------------------------------------------------------------------
 Tue Mar 10 10:03:54 UTC 2020 - Samuel Cabrero <scabrero@suse.de>
 

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.20
+Version:        3.3.21
 Release:        0
 Url:            https://github.com/yast/yast-auth-client
 Summary:        YaST2 - Centralised System Authentication Configuration

diff --git a/src/lib/auth/krbparse.rb b/src/lib/auth/krbparse.rb
@@ -34,6 +34,11 @@ def self.parse(krb_conf_text)
                 if comment_match
                     next
                 end
+                # Skip empty lines
+                empty_match = /^\s+$/.match(line)
+                if empty_match
+                    next
+                end
                 # Remember include/includedir directives
                 include_match = /^(includedir|include|module)\s+(.+)$/.match(line)
                 if include_match

diff --git a/src/lib/authui/ldapkrb/main_dialog.rb b/src/lib/authui/ldapkrb/main_dialog.rb
@@ -166,8 +166,6 @@ def ui_event_loop
                                 UI.ChangeWidget(Id(:nscd_enable), :Value, false)
                             end
                         end
-                    when :ldap_extended_opts
-                        LdapExtendedOptsDialog.new.run
 
                     # Kerberos tab events
                     when :krb_pam