Mercurial > hg > xemacs-beta
diff src/eldap.h @ 412:697ef44129c6 r21-2-14
Import from CVS: tag r21-2-14
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:20:41 +0200 |
| parents | a86b2b5e0111 |
| children | e804706bfb8c |
line wrap: on
line diff
--- a/src/eldap.h Mon Aug 13 11:19:22 2007 +0200 +++ b/src/eldap.h Mon Aug 13 11:20:41 2007 +0200 @@ -18,8 +18,8 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifndef INCLUDED_eldap_h_ -#define INCLUDED_eldap_h_ +#ifndef _XEMACS_ELDAP_H_ +#define _XEMACS_ELDAP_H_ #include <lber.h> #include <ldap.h> @@ -37,20 +37,22 @@ LDAP *ld; /* Name of the host we connected to */ Lisp_Object host; + /* Status of the LDAP connection. */ + int livep; }; -typedef struct Lisp_LDAP Lisp_LDAP; -DECLARE_LRECORD (ldap, Lisp_LDAP); -#define XLDAP(x) XRECORD (x, ldap, Lisp_LDAP) +DECLARE_LRECORD (ldap, struct Lisp_LDAP); +#define XLDAP(x) XRECORD (x, ldap, struct Lisp_LDAP) #define XSETLDAP(x, p) XSETRECORD (x, p, ldap) #define LDAPP(x) RECORDP (x, ldap) +#define GC_LDAPP(x) GC_RECORDP (x, ldap) #define CHECK_LDAP(x) CHECK_RECORD (x, ldap) #define CONCHECK_LDAP(x) CONCHECK_RECORD (x, ldap) #define CHECK_LIVE_LDAP(ldap) do { \ CHECK_LDAP (ldap); \ - if (!XLDAP (ldap)->ld) \ + if (!XLDAP (ldap)->livep) \ signal_simple_error ("Attempting to access closed LDAP connection", \ ldap); \ } while (0) @@ -62,21 +64,12 @@ Lisp_Object Fldap_open (Lisp_Object host, Lisp_Object ldap_plist); Lisp_Object Fldap_close (Lisp_Object ldap); -Lisp_Object Fldap_search_basic (Lisp_Object ldap, - Lisp_Object filter, - Lisp_Object base, - Lisp_Object scope, - Lisp_Object attrs, - Lisp_Object attrsonly, - Lisp_Object withdn, - Lisp_Object verbose); -Lisp_Object Fldap_add (Lisp_Object ldap, - Lisp_Object dn, - Lisp_Object entry); -Lisp_Object Fldap_modify (Lisp_Object ldap, - Lisp_Object dn, - Lisp_Object entry); -Lisp_Object Fldap_delete (Lisp_Object ldap, - Lisp_Object dn); +Lisp_Object Fldap_search_internal (Lisp_Object ldap, + Lisp_Object filter, + Lisp_Object base, + Lisp_Object scope, + Lisp_Object attrs, + Lisp_Object attrsonly, + Lisp_Object withdn); -#endif /* INCLUDED_eldap_h_ */ +#endif /* _XEMACS_ELDAP_H_ */