(ldap-get-values): if ldap_get_values() returns NULL, that's not
necessarily an error (ldap-entry-dn): renamed ldap-message-dn to ldap-entry-dn
This commit is contained in:
parent
a2709c19b9
commit
fcf3a94b1c
|
@ -268,8 +268,13 @@
|
||||||
"scsh_ldap_get_values")
|
"scsh_ldap_get_values")
|
||||||
|
|
||||||
(define (ldap-get-values session entry attribute-name)
|
(define (ldap-get-values session entry attribute-name)
|
||||||
(or (ldap-get-values-internal session (ldap-entry-message entry) attribute-name)
|
(let ((val (ldap-get-values-internal
|
||||||
(raise-ldap-condition (ldap-get-error-return-object session) session)))
|
session (ldap-entry-message entry) attribute-name)))
|
||||||
|
(or val
|
||||||
|
(let ((ret-obj (ldap-get-error-return-object session)))
|
||||||
|
(if (ldap-success? ret-obj)
|
||||||
|
val
|
||||||
|
(raise-ldap-condition ret-obj session))))))
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
|
|
||||||
|
@ -292,8 +297,8 @@
|
||||||
(session message)
|
(session message)
|
||||||
"scsh_ldap_get_dn")
|
"scsh_ldap_get_dn")
|
||||||
|
|
||||||
(define (ldap-message-dn session entry)
|
(define (ldap-entry-dn session entry)
|
||||||
(or (ldap-get-dn-internal session entry)
|
(or (ldap-get-dn-internal session (ldap-entry-message entry))
|
||||||
(raise-ldap-condition (ldap-get-error-return-object session) session)))
|
(raise-ldap-condition (ldap-get-error-return-object session) session)))
|
||||||
|
|
||||||
;;;
|
;;;
|
||||||
|
|
Loading…
Reference in New Issue