conforming to the API defined in RFC 1823.
It has been tested with:
- UMich LDAP 3.3 (http://www.umich.edu/~dirsvcs/ldap/)
- - OpenLDAP 1.0.3 (http://www.openldap.org/)
- - Netscape's LDAP SDK 1.0 (http://developer.netscape.com/) */
+ - OpenLDAP 1.2 (http://www.openldap.org/)
+ - Netscape's LDAP SDK (http://developer.netscape.com/) */
#include <config.h>
#include "eldap.h"
-#ifdef HAVE_NS_LDAP
-# define HAVE_LDAP_SET_OPTION 1
-# define HAVE_LDAP_GET_ERRNO 1
-#else
-# undef HAVE_LDAP_SET_OPTION
-# undef HAVE_LDAP_GET_ERRNO
-#endif
-
static int ldap_default_port;
static Lisp_Object Vldap_default_base;
Lisp_Object Qldapp;
/* ldap-open plist keywords */
-extern Lisp_Object Qport, Qauth, Qbinddn, Qpasswd, Qderef, Qtimelimit,
- Qsizelimit;
+static Lisp_Object Qport, Qauth, Qbinddn, Qpasswd, Qderef, Qtimelimit, Qsizelimit;
/* Search scope limits */
-extern Lisp_Object Qbase, Qonelevel, Qsubtree;
+static Lisp_Object Qbase, Qonelevel, Qsubtree;
/* Authentication methods */
-extern Lisp_Object Qkrbv41, Qkrbv42;
+static Lisp_Object Qkrbv41, Qkrbv42;
/* Deref policy */
-extern Lisp_Object Qnever, Qalways, Qfind;
+static Lisp_Object Qnever, Qalways, Qfind;
\f
/************************************************************************/
/* Utility Functions */
/************************************************************************/
static void
-signal_ldap_error (LDAP *ld)
+signal_ldap_error (LDAP *ld, LDAPMessage *res, int ldap_err)
{
-#ifdef HAVE_LDAP_GET_ERRNO
- signal_simple_error
- ("LDAP error",
- build_string (ldap_err2string (ldap_get_lderrno (ld, NULL, NULL))));
+ if (ldap_err <= 0)
+ {
+#if defined HAVE_LDAP_PARSE_RESULT
+ int err;
+ ldap_err = ldap_parse_result (ld, res,
+ &err,
+ NULL, NULL, NULL, NULL, 0);
+ if (ldap_err == LDAP_SUCCESS)
+ ldap_err = err;
+#elif defined HAVE_LDAP_GET_LDERRNO
+ ldap_err = ldap_get_lderrno (ld, NULL, NULL);
+#elif defined HAVE_LDAP_RESULT2ERROR
+ ldap_err = ldap_result2error (ld, res, 0);
#else
- signal_simple_error ("LDAP error",
- build_string (ldap_err2string (ld->ld_errno)));
+ ldap_err = ld->ld_errno;
#endif
+ }
+ signal_simple_error ("LDAP error",
+ build_string (ldap_err2string (ldap_err)));
}
\f
/************************************************************************/
static Lisp_Object
-make_ldap (struct Lisp_LDAP *ldap)
+make_ldap (Lisp_LDAP *ldap)
{
Lisp_Object lisp_ldap;
XSETLDAP (lisp_ldap, ldap);
}
static Lisp_Object
-mark_ldap (Lisp_Object obj, void (*markobj) (Lisp_Object))
+mark_ldap (Lisp_Object obj)
{
return XLDAP (obj)->host;
}
{
char buf[32];
- struct Lisp_LDAP *ldap = XLDAP (obj);
+ Lisp_LDAP *ldap = XLDAP (obj);
if (print_readably)
error ("printing unreadable object #<ldap %s>",
write_c_string ("#<ldap ", printcharfun);
print_internal (ldap->host, printcharfun, 1);
- if (!ldap->livep)
+ if (!ldap->ld)
write_c_string ("(dead) ",printcharfun);
sprintf (buf, " 0x%x>", (unsigned int)ldap);
write_c_string (buf, printcharfun);
}
-static struct Lisp_LDAP *
+static Lisp_LDAP *
allocate_ldap (void)
{
- struct Lisp_LDAP *ldap =
- alloc_lcrecord_type (struct Lisp_LDAP, &lrecord_ldap);
+ Lisp_LDAP *ldap = alloc_lcrecord_type (Lisp_LDAP, &lrecord_ldap);
ldap->ld = NULL;
ldap->host = Qnil;
- ldap->livep = 0;
return ldap;
}
static void
finalize_ldap (void *header, int for_disksave)
{
- struct Lisp_LDAP *ldap = (struct Lisp_LDAP *) header;
+ Lisp_LDAP *ldap = (Lisp_LDAP *) header;
if (for_disksave)
signal_simple_error ("Can't dump an emacs containing LDAP objects",
make_ldap (ldap));
- if (ldap->livep)
+ if (ldap->ld)
ldap_unbind (ldap->ld);
+ ldap->ld = NULL;
}
DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap,
mark_ldap, print_ldap, finalize_ldap,
- NULL, NULL, struct Lisp_LDAP);
+ NULL, NULL, 0, Lisp_LDAP);
(ldap))
{
CHECK_LDAP (ldap);
- return (XLDAP (ldap))->livep ? Qt : Qnil;
+ return (XLDAP (ldap))->ld ? Qt : Qnil;
}
\f
/************************************************************************/
(host, plist))
{
/* This function can GC */
- struct Lisp_LDAP *ldap;
+ Lisp_LDAP *ldap;
LDAP *ld;
int ldap_port = 0;
int ldap_auth = LDAP_AUTH_SIMPLE;
else if (EQ (keyword, Qbinddn))
{
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, ldap_binddn);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value,
+ C_STRING_ALLOCA, ldap_binddn,
+ Qnative);
}
/* Password */
else if (EQ (keyword, Qpasswd))
{
CHECK_STRING (value);
- GET_C_STRING_OS_DATA_ALLOCA (value, ldap_passwd);
+ TO_EXTERNAL_FORMAT (LISP_STRING, value,
+ C_STRING_ALLOCA, ldap_passwd,
+ Qnative);
}
/* Deref */
else if (EQ (keyword, Qderef))
#ifdef HAVE_LDAP_SET_OPTION
- if (ldap_set_option (ld, LDAP_OPT_DEREF, (void *)&ldap_deref) != LDAP_SUCCESS)
- signal_ldap_error (ld);
- if (ldap_set_option (ld, LDAP_OPT_TIMELIMIT,
- (void *)&ldap_timelimit) != LDAP_SUCCESS)
- signal_ldap_error (ld);
- if (ldap_set_option (ld, LDAP_OPT_SIZELIMIT,
- (void *)&ldap_sizelimit) != LDAP_SUCCESS)
- signal_ldap_error (ld);
- if (ldap_set_option (ld, LDAP_OPT_REFERRALS, LDAP_OPT_ON) != LDAP_SUCCESS)
- signal_ldap_error (ld);
+ if ((err = ldap_set_option (ld, LDAP_OPT_DEREF,
+ (void *)&ldap_deref)) != LDAP_SUCCESS)
+ signal_ldap_error (ld, NULL, err);
+ if ((err = ldap_set_option (ld, LDAP_OPT_TIMELIMIT,
+ (void *)&ldap_timelimit)) != LDAP_SUCCESS)
+ signal_ldap_error (ld, NULL, err);
+ if ((err = ldap_set_option (ld, LDAP_OPT_SIZELIMIT,
+ (void *)&ldap_sizelimit)) != LDAP_SUCCESS)
+ signal_ldap_error (ld, NULL, err);
+ if ((err = ldap_set_option (ld, LDAP_OPT_REFERRALS,
+ LDAP_OPT_ON)) != LDAP_SUCCESS)
+ signal_ldap_error (ld, NULL, err);
#else /* not HAVE_LDAP_SET_OPTION */
ld->ld_deref = ldap_deref;
ld->ld_timelimit = ldap_timelimit;
ldap = allocate_ldap ();
ldap->ld = ld;
ldap->host = host;
- ldap->livep = 1;
return make_ldap (ldap);
}
*/
(ldap))
{
- struct Lisp_LDAP *lldap;
+ Lisp_LDAP *lldap;
CHECK_LIVE_LDAP (ldap);
lldap = XLDAP (ldap);
ldap_unbind (lldap->ld);
- lldap->livep = 0;
+ lldap->ld = NULL;
return Qnil;
}
LDAPMessage *e;
BerElement *ptr;
char *a, *dn;
- int i, rc;
+ int i, rc, rc2;
int matches;
struct ldap_unwind_struct unwind;
{
Lisp_Object current = XCAR (attrs);
CHECK_STRING (current);
- GET_C_STRING_OS_DATA_ALLOCA (current, ldap_attributes[i]);
+ TO_EXTERNAL_FORMAT (LISP_STRING, current,
+ C_STRING_ALLOCA, ldap_attributes[i],
+ Qnative);
++i;
}
ldap_attributes[i] = NULL;
NILP (filter) ? "" : (char *) XSTRING_DATA (filter),
ldap_attributes,
NILP (attrsonly) ? 0 : 1)
- == -1)
+ == -1)
{
- signal_ldap_error (ld);
+ signal_ldap_error (ld, NULL, 0);
}
/* Ensure we don't exit without cleaning up */
{
dn = ldap_get_dn (ld, e);
if (dn == NULL)
- {
- signal_ldap_error (ld);
- }
- entry = Fcons (build_ext_string (dn, FORMAT_OS), Qnil);
+ signal_ldap_error (ld, e, 0);
+ entry = Fcons (build_ext_string (dn, Qnative), Qnil);
}
for (a= ldap_first_attribute (ld, e, &ptr);
a != NULL;
a = ldap_next_attribute (ld, e, ptr) )
{
- list = Fcons (build_ext_string (a, FORMAT_OS), Qnil);
+ list = Fcons (build_ext_string (a, Qnative), Qnil);
unwind.vals = ldap_get_values_len (ld, e, a);
if (unwind.vals != NULL)
{
{
list = Fcons (make_ext_string (unwind.vals[i]->bv_val,
unwind.vals[i]->bv_len,
- FORMAT_OS),
+ Qnative),
list);
}
}
}
if (rc == -1)
- {
- signal_ldap_error (ld);
- }
+ signal_ldap_error (ld, unwind.res, 0);
+
+ if (rc == 0)
+ signal_ldap_error (ld, NULL, LDAP_TIMELIMIT_EXCEEDED);
+
+#if defined HAVE_LDAP_PARSE_RESULT
+ rc2 = ldap_parse_result (ld, unwind.res,
+ &rc,
+ NULL, NULL, NULL, NULL, 0);
+ if (rc2 != LDAP_SUCCESS)
+ rc = rc2;
+#elif defined HAVE_LDAP_RESULT2ERROR
rc = ldap_result2error (ld, unwind.res, 0);
- if ((rc != LDAP_SUCCESS) &&
- (rc != LDAP_SIZELIMIT_EXCEEDED))
- {
- signal_ldap_error (ld);
- }
+#endif
+ if ((rc != LDAP_SUCCESS) && (rc != LDAP_SIZELIMIT_EXCEEDED))
+ signal_ldap_error (ld, NULL, rc);
ldap_msgfree (unwind.res);
unwind.res = (LDAPMessage *)NULL;
syms_of_eldap (void)
{
defsymbol (&Qldapp, "ldapp");
+ defsymbol (&Qport, "port");
+ defsymbol (&Qauth, "auth");
+ defsymbol (&Qbinddn, "binddn");
+ defsymbol (&Qpasswd, "passwd");
+ defsymbol (&Qderef, "deref");
+ defsymbol (&Qtimelimit, "timelimit");
+ defsymbol (&Qsizelimit, "sizelimit");
+ defsymbol (&Qbase, "base");
+ defsymbol (&Qonelevel, "onelevel");
+ defsymbol (&Qsubtree, "subtree");
+ defsymbol (&Qkrbv41, "krbv41");
+ defsymbol (&Qkrbv42, "krbv42");
+ defsymbol (&Qnever, "never");
+ defsymbol (&Qalways, "always");
+ defsymbol (&Qfind, "find");
+
DEFSUBR (Fldapp);
DEFSUBR (Fldap_host);
DEFSUBR (Fldap_status);
projects / chise / xemacs-chise.git.1 / blobdiff