X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=elmo%2Fpldap.el;h=1d6d65f712db37180124d2413a909d7d8af03af4;hb=a5bcb1f0eb41b558a6b4ed277047adc6b8676a2a;hp=e8b944bb7c881805423f2f488d934063fa017e5e;hpb=50d211e18312570d93fec88d014772018c809e9a;p=elisp%2Fwanderlust.git

diff --git a/elmo/pldap.el b/elmo/pldap.el
index e8b944b..1d6d65f 100644
--- a/elmo/pldap.el
+++ b/elmo/pldap.el
@@ -509,12 +509,12 @@ DN is the distinguished name of the entry to delete."
 		       nil (current-buffer) t
 		       (append arglist
 			       (list dn))))
-      (if (integerp ret)
-	  (if (not (zerop ret))
-	      (error (car (split-string (buffer-string) "\n"))))
-	(if (and (setq ret (buffer-string)); Nemacs
-		 (string-match "ldap_delete:" ret))
-	    (error (car (split-string ret "\n"))))))))
+      (cond ((integerp ret)
+	     (or (zerop ret)
+		 (error "%s" (car (split-string (buffer-string) "\n")))))
+	    ((and (setq ret (buffer-string)); Nemacs
+		  (string-match "ldap_delete:" ret))
+	     (error "%s" (car (split-string ret "\n"))))))))
 
 (defmacro ldap/ldif-insert-field (attr value)
   (` (if (not (ldap/ldif-safe-string-p (, value)))
@@ -567,12 +567,12 @@ or `replace'.  ATTR is the LDAP attribute type to modify."
 		       ldap-modify-program
 		       t t nil
 		       arglist))
-      (if (integerp ret)
-	  (if (not (zerop ret))
-	      (error (car (split-string (buffer-string) "\n"))))
-	(if (and (setq ret (buffer-string)); Nemacs
-		 (string-match "ldap_modify:" ret))
-	    (error (car (split-string ret "\n"))))))))
+      (cond ((integerp ret)
+	     (or (zerop ret)
+		 (error "%s" (car (split-string (buffer-string) "\n")))))
+	    ((and (setq ret (buffer-string)); Nemacs
+		  (string-match "ldap_modify:" ret))
+	     (error "%s" (car (split-string ret "\n"))))))))
 
 (defun ldap-add (ldap dn entry)
   "Add an entry to an LDAP directory.
@@ -607,12 +607,12 @@ containing attribute/value string pairs."
 		       ldap-add-program
 		       t t nil
 		       arglist))
-      (if (integerp ret)
-	  (if (not (zerop ret))
-	      (error (car (split-string (buffer-string) "\n"))))
-	(if (and (setq ret (buffer-string)) ; Nemacs
-		 (string-match "ldap_add:" ret))
-	    (error (car (split-string ret "\n"))))))))
+      (cond ((integerp ret)
+	     (or (zerop ret)
+		 (error "%s" (car (split-string (buffer-string) "\n")))))
+	    ((and (setq ret (buffer-string)) ; Nemacs
+		  (string-match "ldap_add:" ret))
+	     (error "%s" (car (split-string ret "\n"))))))))
 
 (defun ldap-search-basic (ldap filter base scope
 			       &optional attrs attrsonly withdn verbose)