From 4850ffaef859a3f33f03c5500602881e30b1039c Mon Sep 17 00:00:00 2001 From: ckonstanski Date: Tue, 22 Dec 2020 20:57:44 -0700 Subject: Moved core to its own library --- entity/ldap-user.lisp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'entity/ldap-user.lisp') diff --git a/entity/ldap-user.lisp b/entity/ldap-user.lisp index f8d8a1c..9097e54 100644 --- a/entity/ldap-user.lisp +++ b/entity/ldap-user.lisp @@ -50,14 +50,14 @@ (change-attrs (remove-if #'null (mapcar (lambda (attr) (let ((new-attr (assoc (car attr) new-attrs))) - (cond ((and (null-or-empty-p (cdr attr)) - (not (null-or-empty-p (cdr new-attr)))) + (cond ((and (org-ckons-core::null-or-empty-p (cdr attr)) + (not (org-ckons-core::null-or-empty-p (cdr new-attr)))) `(ldap:add ,(car attr) ,(cdr new-attr))) - ((and (not (null-or-empty-p (cdr attr))) - (null-or-empty-p (cdr new-attr))) + ((and (not (org-ckons-core::null-or-empty-p (cdr attr))) + (org-ckons-core::null-or-empty-p (cdr new-attr))) `(ldap:delete ,(car attr) ,(cdr attr))) - ((and (not (null-or-empty-p (cdr attr))) - (not (null-or-empty-p (cdr new-attr))) + ((and (not (org-ckons-core::null-or-empty-p (cdr attr))) + (not (org-ckons-core::null-or-empty-p (cdr new-attr))) (not (string= (cdr attr) (cdr new-attr)))) `(ldap:replace ,(car attr) ,(cdr new-attr)))))) existing-attrs)))) @@ -71,5 +71,5 @@ (defmethod add-ldap-user ((ldap-user ldap-user) (ldap ldap)) (let* ((new-attrs (attribute-value-list ldap-user)) - (new-entry (ldap:new-entry (get-user-dn ldap-user ldap) :attrs (add-to-list new-attrs '((objectclass . (inetorgperson))))))) + (new-entry (ldap:new-entry (get-user-dn ldap-user ldap) :attrs (org-ckons-core::add-to-list new-attrs '((objectclass . (inetorgperson))))))) (ldap:add new-entry (connection ldap)))) -- cgit v1.3