Merge remote-tracking branch 'upstream/SLE-12-SP5' into SLE-15-SP4

yast · Sep 18, 2023 · 6049904 · 6049904
2 parents 721f72a + 7ae6774
commit 6049904
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
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);
+- 4.4.5
+
 -------------------------------------------------------------------
 Wed Aug 31 07:27:37 UTC 2022 - Michal Filka <mfilka@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:        4.4.4
+Version:        4.4.5
 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