Package: emacs21-el
Version: 21.4a-3
Followup-For: Bug #381484

As outlined in the thread started by Daneil Katz with subject "EUDC, BBDB, 
LDAP, and Emacs21" at 
http://groups.google.de/group/gnu.emacs.help/tree/browse_frm/month/2001-11/8ed7e2e367b01b28?rnum=91&hl=en&_done=%2Fgroup%2Fgnu.emacs.help%2Fbrowse_frm%2Fmonth%2F2001-11%3Fhl%3Den%26#doc_10534598c215f732

PS. Also removed -B which seems to be a relic from old days, and added -x for
    simple authentication. Seems to be that it is a good default.

Patch:

--- /usr/share/emacs/21.4/lisp/net/ldap.el.orig 2001-12-28 07:28:32.000000000 
+0100
+++ /usr/share/emacs/21.4/lisp/net/ldap.el      2006-08-08 06:30:29.000000000 
+0200
@@ -157,7 +157,7 @@
   :type '(string :tag "`ldapsearch' Program")
   :group 'ldap)

-(defcustom ldap-ldapsearch-args '("-B")
+(defcustom ldap-ldapsearch-args '("-x")
   "*A list of additional arguments to pass to `ldapsearch'.
 It is recommended to use the `-T' switch with Netscape's
 implementation to avoid line wrapping.
@@ -587,12 +587,13 @@
          (while (looking-at "^\\(\\w*\\)[=:\t ]+\\(<[\t 
]*file://\\)?\\(.*\\)$")
            (setq name (match-string 1)
                  value (match-string 3))
-           (save-excursion
-             (set-buffer bufval)
-             (erase-buffer)
-             (insert-file-contents-literally value)
-             (delete-file value)
-             (setq value (buffer-substring (point-min) (point-max))))
+           (if (string-match "^< file:///\\(.*\\)$" value)
+               (save-excursion
+                 (set-buffer bufval)
+                 (erase-buffer)
+                 (insert-file-contents-literally value)
+                 (delete-file value)
+                 (setq value (buffer-substring (point-min) (point-max)))))
            (setq record (cons (list name value)
                               record))
            (forward-line 1))

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (900, 'testing'), (400, 'stable'), (300, 'unstable')
Architecture: i386 (i686)
Shell:  /bin/sh linked to /bin/bash
Kernel: Linux 2.4.27-2-686-smp
Locale: LANG=C, LC_CTYPE=sv_SE.ISO-8859-1 (charmap=ISO-8859-1)

Versions of packages emacs21-el depends on:
ii  emacs21-common                21.4a-3    The GNU Emacs editor's shared, arc

emacs21-el recommends no packages.

-- no debconf information


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to