* scheme/ldap.scm (ldap-get-values): unpack ldap-entry

(ldap-count-entries): ditto
(ldap-first-entry): ditto
(ldap-next-entry): ditto
This commit is contained in:
eknauel 2004-02-12 14:29:02 +00:00
parent 90580b2fc4
commit a312de7a51
1 changed files with 9 additions and 9 deletions

View File

@ -268,7 +268,7 @@
"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 entry attribute-name) (or (ldap-get-values-internal session (ldap-entry-message entry) attribute-name)
(raise-ldap-condition (ldap-get-error-return-object session) session))) (raise-ldap-condition (ldap-get-error-return-object session) session)))
;;; ;;;
@ -340,28 +340,28 @@
(session message) (session message)
"scsh_ldap_next_entry") "scsh_ldap_next_entry")
(define (ldap-count-entries session message) (define (ldap-count-entries session entry)
(or (ldap-count-entries-internal session message) (or (ldap-count-entries-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)))
(define (ldap-first-entry session message) (define (ldap-first-entry session entry)
(cond (cond
((ldap-first-entry-internal session message) ((ldap-first-entry-internal session (ldap-entry-message entry))
=> (lambda (new-message) => (lambda (new-message)
(add-finalizer! new-message ldap-message-finalizer) (add-finalizer! new-message ldap-message-finalizer)
new-message)) (make-ldap-entry new-message)))
(else (else
(let ((ret-obj (ldap-get-error-return-object session))) (let ((ret-obj (ldap-get-error-return-object session)))
(if (ldap-success? ret-obj) (if (ldap-success? ret-obj)
#f #f
(raise-ldap-condition ret-obj session)))))) (raise-ldap-condition ret-obj session))))))
(define (ldap-next-entry session message) (define (ldap-next-entry session entry)
(cond (cond
((ldap-next-entry-internal session message) ((ldap-next-entry-internal session (ldap-entry-message entry))
=> (lambda (new-message) => (lambda (new-message)
(add-finalizer! new-message ldap-message-finalizer) (add-finalizer! new-message ldap-message-finalizer)
new-message)) (make-ldap-entry new-message)))
(else (else
(let ((ret-obj (ldap-get-error-return-object session))) (let ((ret-obj (ldap-get-error-return-object session)))
(if (ldap-success? ret-obj) (if (ldap-success? ret-obj)