emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 937ae0cf55: Fix ldapsearch output parsing in ldap-search-internal


From: Filipp Gunbin
Subject: master 937ae0cf55: Fix ldapsearch output parsing in ldap-search-internal
Date: Thu, 20 Oct 2022 13:52:25 -0400 (EDT)

branch: master
commit 937ae0cf55d31c332fba3d96061e2ac3653e5437
Author: Filipp Gunbin <fgunbin@fastmail.fm>
Commit: Filipp Gunbin <fgunbin@fastmail.fm>

    Fix ldapsearch output parsing in ldap-search-internal
    
    * lisp/net/ldap.el (ldap-search-internal): When parsing output, make
    sure that file:// matched before opening the file. (bug#58605)
---
 lisp/net/ldap.el | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 062ff05d69..ccad8c4edb 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -715,14 +715,14 @@ an alist of attribute/value pairs."
                      (eq (string-match "/\\(.:.*\\)$" value) 0))
                 (setq value (match-string 1 value)))
            ;; Do not try to open non-existent files
-           (if (equal value "")
-               (setq value " ")
-             (with-current-buffer bufval
+            (if (match-string 3)
+              (with-current-buffer bufval
                (erase-buffer)
                (set-buffer-multibyte nil)
                (insert-file-contents-literally value)
                (delete-file value)
-               (setq value (buffer-string))))
+               (setq value (buffer-string)))
+              (setq value " "))
            (setq record (cons (list name value)
                               record))
            (forward-line 1))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]