Mercurial > hg > xemacs-beta
view src/eldap.c @ 502:7039e6323819
[xemacs-hg @ 2001-05-04 22:41:46 by ben]
----------------------- byte-comp warning fixes -----------------
New functions for cleanly eliminating byte-compiler warnings.
Their definitions require no changes at all in bytecomp.el,
meaning that any package that wants to use them and be compatible
with older versions of XEmacs need only copy the code and rename
the functions (i.e. prefix them with the package name).
Eliminate byte-compiler warnings using the new functions in
bytecomp-runtime.el.
Move coding-system-put,get,category, since they're not
Mule-specific and are used in prefer-coding-system.
font.el was incredibly ugly. Clean it up. Avoid using defsubst
for any exported functions, to avoid possible compatibility
problems if we later change the internal interface. (It happened
before, with face accessors, between 19.8 and 19.9). Fix tons
of warnings.
Clean up (new function gpm-is-supported-p eliminates duplicate
code in gpm-create/delete-device-hook) and eliminate warnings.
---------- make byte-recompile-directory work in the ---------
core `lisp' dir, even in the absence of
a Mule XEmacs (i.e. make it skip the Mule
files rather than trying to compile them).
now you should be able to do `touch *.el'
in the `lisp' dir, then
M-x byte-recompile-directory, and get no
warnings.
Avoid trying to compile Mule files in byte-recompile-directory
when we're not in a Mule XEmacs, since we're highly likely to get
syntax errors.
Add a coding-system cookie to all Mule files so that
byte-recompile-directory ignores them.
Magic cookie function moved to files.el from code-files.el (for
use by bytecomp even in a non-coding-system XEmacs), and changed
names and semantics for use by bytecomp. NOTE: IMO this is an
internal function that we can change as we like (and there is
absolutely no code anywhere else using the function).
---------------- GUI improvements: menus, help -------------------
Rearrange order of keymap declarations to be alphabetical.
Improve help on help to include all bindings, and group by
category. Add bindings for new Info commands. Remove
warnings. Use command-hyper-apropos in place of command-apropos.
Add a function to do the equivalent of command-apropos.
Evals its help-text argument so you can put expressions there.
Used now by help-for-help.
Add binding to continue text searches. Expand index searches to
work over multiple info documents. Add commands to search
text/index in User and Lispref.
Add new entry, "Uncomment Region" (parallels "Comment Out Region").
Redo Help menu; add bindings for new Info commands to search the
index or text of the User and Lispref manuals. Add command for
mark-paragraph, activate-region. Make Edit->R accelerator be
rectangle, not register (more commonly used), and put rectangle
first. Fix the Edit Init File entry to never load the .elc file.
Simplify the default-popup-menu. Add Cmds->Tabs menu.
Use kp-left not kp_left, etc.
---------------- Miscellaneous bug fixes/cleanup -------------------
byte-compiler-options: Correct doc string.
easy-menu-do-define: fix extra quote.
fill-paragraph-or-region:Rewrite to be more correct -- use
call-interactively so that we always get exactly the same
behavior as if the functions were called directly.
No need to fiddle with zmacs-region-stays, now that bogus
clearing of it (2001-04-28 src/ChangeLog) is removed.
Put dialog titles back in -- this time correctly. Fix various
other problems with leaks and such.
key-sequence-list-description:
Clean up fun to always correctly canonicalize.
Clean up Kinsoku comments, synch comment-region with FSF 20.7.
* simple.el (region-exists-p):
* simple.el (region-active-p):
Add comment about which one is correct to use in menu specs.
* sound.el (load-sound-file):
Minor code clean up.
* startup.el:
* startup.el (command-line-early):
* startup.el (initial-scratch-message):
Comment changes. Add info about sample.init.el to splash screen.
Improve initial-scratch-message and clarify purpose of Scratch
buffer. Fix byte-compile warning.
------------------------ Added features -------------------------
Add new variable to control whether etags checks all parent
directories for tag files. (On by default.)
* hash-table.el: New file, useful utility functions.
* dumped-lisp.el (preloaded-file-list): Dump hash-table.el.
------------ notable bug fix: Windows event code --------------
Get critical quit working.
------------ notable bug fix and new feature: regex code --------------
Shy groups were implemented in a horrible, half-assed way that
would cause them to screw up regex searching in most cases.
Fixed to work correctly.
Also extended back-reference syntax past 9. Only is recognized
as such if there are at least that many non-shy groups; and
optionally will warn about such uses, to catch old code that
might be using them differently. (Added variable to control
this in search.c -- `warn-about-possibly-incompatible-back-
references', on by default for the moment. Declared in lisp.h.
---------------- process/SIGIO improvements -------------------
define USE_GETADDRINFO to replace more complex conditional,
and use it. the code conditionalized on this in
unix_open_network_stream had *serious* problems handling errors.
it's now fixed, and major amounts of duplicate code between
the two versions were combined.
don't disable SIGIO and other interrupts unless
CONNECT_NEEDS_SLOWED_INTERRUPTS is defined -- don't penalize OS's
without bugs. similarly for a freebsd bug that was affecting all
OS's.
* s\ultrix.h:
define CONNECT_NEEDS_SLOWED_INTERRUPTS, since that's the OS
mentioned as having a kernel bug.
* sysdep.c (request_sigio_on_device):
* sysdep.c (unrequest_sigio_on_device):
fix SIGIO problems on Linux. add check for O_ASYNC in case it's
defined and FASYNC isn't. add comment about other ways to do
SIGIO on Linux.
* callproc.c (Fold_call_process_internal):
* process.c (Fstart_process_internal):
Deal with the possibility that `default-directory' doesn't
have terminating slash. Correct comments about vfork.
---------------- Miscellaneous bug fixes/cleanup -------------------
* callint.c (Finteractive):
Add lots of documentation -- exactly what the Lisp equivalents of
all the interactive specs are.
* console.h (struct console): change type of quit_char to Emchar.
* event-msw.c (lstream_type_create_mswindows_selectable): spacing
change.
Eliminate events-mod.h and combine into events.h.
* emacs.c:
* emacs.c (make_arg_list_1):
* emacs.c (main_1):
A couple of char->Extbyte changes, add a comment.
* glyphs-msw.c:
Correct indentation of function defns to not exceed 80 cols.
Try (sort of) to fix some code that sets the colors of the
progress gauge. (Commented out)
* keymap.c (syms_of_keymap):
use DEFSYMBOL.
* process.c (read_process_output):
No need to fiddle with zmacs_region_stays, now that bogus
clearing of it (see below) is removed.
* search.c (Freplace_match): warning fix.
author | ben |
---|---|
date | Fri, 04 May 2001 22:42:35 +0000 |
parents | c33ae14dd6d0 |
children | 183866b06e0b |
line wrap: on
line source
/* LDAP client interface for XEmacs. Copyright (C) 1998 Free Software Foundation, Inc. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* Author: Oscar Figueiredo with lots of support from Hrvoje Niksic */ /* This file provides lisp primitives for access to an LDAP library 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.2 (http://www.openldap.org/) - Netscape's LDAP SDK (http://developer.netscape.com/) */ #include <config.h> #include "lisp.h" #include "opaque.h" #include "sysdep.h" #include "buffer.h" #include <errno.h> #include "eldap.h" static Fixnum ldap_default_port; static Lisp_Object Vldap_default_base; /* Needed by the lrecord definition */ Lisp_Object Qldapp; /* ldap-open plist keywords */ static Lisp_Object Qport, Qauth, Qbinddn, Qpasswd, Qderef, Qtimelimit, Qsizelimit; /* Search scope limits */ static Lisp_Object Qbase, Qonelevel, Qsubtree; /* Authentication methods */ static Lisp_Object Qkrbv41, Qkrbv42; /* Deref policy */ static Lisp_Object Qnever, Qalways, Qfind; /* Modification types (Qdelete is defined in general.c) */ static Lisp_Object Qadd, Qreplace; /************************************************************************/ /* Utility Functions */ /************************************************************************/ static void signal_ldap_error (LDAP *ld, LDAPMessage *res, int ldap_err) { 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 ldap_err = ld->ld_errno; #endif } signal_simple_error ("LDAP error", build_string (ldap_err2string (ldap_err))); } /************************************************************************/ /* ldap lrecord basic functions */ /************************************************************************/ static Lisp_Object make_ldap (Lisp_LDAP *ldap) { Lisp_Object lisp_ldap; XSETLDAP (lisp_ldap, ldap); return lisp_ldap; } static Lisp_Object mark_ldap (Lisp_Object obj) { return XLDAP (obj)->host; } static void print_ldap (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) { char buf[32]; Lisp_LDAP *ldap = XLDAP (obj); if (print_readably) error ("printing unreadable object #<ldap %s>", XSTRING_DATA (ldap->host)); write_c_string ("#<ldap ", printcharfun); print_internal (ldap->host, printcharfun, 1); if (!ldap->ld) write_c_string ("(dead) ",printcharfun); sprintf (buf, " 0x%lx>", (long)ldap); write_c_string (buf, printcharfun); } static Lisp_LDAP * allocate_ldap (void) { Lisp_LDAP *ldap = alloc_lcrecord_type (Lisp_LDAP, &lrecord_ldap); ldap->ld = NULL; ldap->host = Qnil; return ldap; } static void finalize_ldap (void *header, int for_disksave) { 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->ld) ldap_unbind (ldap->ld); ldap->ld = NULL; } DEFINE_LRECORD_IMPLEMENTATION ("ldap", ldap, mark_ldap, print_ldap, finalize_ldap, NULL, NULL, 0, Lisp_LDAP); /************************************************************************/ /* Basic ldap accessors */ /************************************************************************/ DEFUN ("ldapp", Fldapp, 1, 1, 0, /* Return t if OBJECT is a LDAP connection. */ (object)) { return LDAPP (object) ? Qt : Qnil; } DEFUN ("ldap-host", Fldap_host, 1, 1, 0, /* Return the server host of the connection LDAP, as a string. */ (ldap)) { CHECK_LDAP (ldap); return (XLDAP (ldap))->host; } DEFUN ("ldap-live-p", Fldap_status, 1, 1, 0, /* Return t if LDAP is an active LDAP connection. */ (ldap)) { CHECK_LDAP (ldap); return (XLDAP (ldap))->ld ? Qt : Qnil; } /************************************************************************/ /* Opening/Closing a LDAP connection */ /************************************************************************/ DEFUN ("ldap-open", Fldap_open, 1, 2, 0, /* Open a LDAP connection to HOST. PLIST is a plist containing additional parameters for the connection. Valid keys in that list are: `port' the TCP port to use for the connection if different from `ldap-default-port'. `auth' is the authentication method to use, possible values depend on the LDAP library XEmacs was compiled with: `simple', `krbv41' and `krbv42'. `binddn' is the distinguished name of the user to bind as (in RFC 1779 syntax). `passwd' is the password to use for simple authentication. `deref' is one of the symbols `never', `always', `search' or `find'. `timelimit' is the timeout limit for the connection in seconds. `sizelimit' is the maximum number of matches to return. */ (host, plist)) { /* This function can GC */ Lisp_LDAP *ldap; LDAP *ld; int ldap_port = 0; int ldap_auth = LDAP_AUTH_SIMPLE; char *ldap_binddn = NULL; char *ldap_passwd = NULL; int ldap_deref = LDAP_DEREF_NEVER; int ldap_timelimit = 0; int ldap_sizelimit = 0; int err; CHECK_STRING (host); { EXTERNAL_PROPERTY_LIST_LOOP_3 (keyword, value, plist) { /* TCP Port */ if (EQ (keyword, Qport)) { CHECK_INT (value); ldap_port = XINT (value); } /* Authentication method */ if (EQ (keyword, Qauth)) { if (EQ (value, Qsimple)) ldap_auth = LDAP_AUTH_SIMPLE; #ifdef LDAP_AUTH_KRBV41 else if (EQ (value, Qkrbv41)) ldap_auth = LDAP_AUTH_KRBV41; #endif #ifdef LDAP_AUTH_KRBV42 else if (EQ (value, Qkrbv42)) ldap_auth = LDAP_AUTH_KRBV42; #endif else signal_simple_error ("Invalid authentication method", value); } /* Bind DN */ else if (EQ (keyword, Qbinddn)) { CHECK_STRING (value); LISP_STRING_TO_EXTERNAL (value, ldap_binddn, Qnative); } /* Password */ else if (EQ (keyword, Qpasswd)) { CHECK_STRING (value); LISP_STRING_TO_EXTERNAL (value, ldap_passwd, Qnative); } /* Deref */ else if (EQ (keyword, Qderef)) { if (EQ (value, Qnever)) ldap_deref = LDAP_DEREF_NEVER; else if (EQ (value, Qsearch)) ldap_deref = LDAP_DEREF_SEARCHING; else if (EQ (value, Qfind)) ldap_deref = LDAP_DEREF_FINDING; else if (EQ (value, Qalways)) ldap_deref = LDAP_DEREF_ALWAYS; else signal_simple_error ("Invalid deref value", value); } /* Timelimit */ else if (EQ (keyword, Qtimelimit)) { CHECK_INT (value); ldap_timelimit = XINT (value); } /* Sizelimit */ else if (EQ (keyword, Qsizelimit)) { CHECK_INT (value); ldap_sizelimit = XINT (value); } } } if (ldap_port == 0) { ldap_port = ldap_default_port; } /* Connect to the server and bind */ slow_down_interrupts (); ld = ldap_open ((char *) XSTRING_DATA (host), ldap_port); speed_up_interrupts (); if (ld == NULL ) signal_simple_error_2 ("Failed connecting to host", host, lisp_strerror (errno)); #ifdef HAVE_LDAP_SET_OPTION 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); if ((err = ldap_set_option (ld, LDAP_OPT_RESTART, 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; ld->ld_sizelimit = ldap_sizelimit; #ifdef LDAP_REFERRALS ld->ld_options = LDAP_OPT_REFERRALS; #else /* not LDAP_REFERRALS */ ld->ld_options = 0; #endif /* not LDAP_REFERRALS */ /* XEmacs uses interrupts (SIGIO,SIGALRM), LDAP calls need to ignore them */ ld->ld_options |= LDAP_OPT_RESTART; #endif /* not HAVE_LDAP_SET_OPTION */ err = ldap_bind_s (ld, ldap_binddn, ldap_passwd, ldap_auth); if (err != LDAP_SUCCESS) signal_simple_error ("Failed binding to the server", build_string (ldap_err2string (err))); ldap = allocate_ldap (); ldap->ld = ld; ldap->host = host; return make_ldap (ldap); } DEFUN ("ldap-close", Fldap_close, 1, 1, 0, /* Close an LDAP connection. */ (ldap)) { Lisp_LDAP *lldap; CHECK_LIVE_LDAP (ldap); lldap = XLDAP (ldap); ldap_unbind (lldap->ld); lldap->ld = NULL; return Qnil; } /************************************************************************/ /* Working on a LDAP connection */ /************************************************************************/ struct ldap_unwind_struct { LDAPMessage *res; struct berval **vals; }; static Lisp_Object ldap_search_unwind (Lisp_Object unwind_obj) { struct ldap_unwind_struct *unwind = (struct ldap_unwind_struct *) get_opaque_ptr (unwind_obj); if (unwind->res) ldap_msgfree (unwind->res); if (unwind->vals) ldap_value_free_len (unwind->vals); return Qnil; } /* The following function is called `ldap-search-basic' instead of */ /* plain `ldap-search' to maintain compatibility with the XEmacs 21.1 */ /* API where `ldap-search' was the name of the high-level search */ /* function */ DEFUN ("ldap-search-basic", Fldap_search_basic, 2, 8, 0, /* Perform a search on an open LDAP connection. LDAP is an LDAP connection object created with `ldap-open'. FILTER is a filter string for the search as described in RFC 1558. BASE is the distinguished name at which to start the search. SCOPE is one of the symbols `base', `onelevel' or `subtree' indicating the scope of the search. ATTRS is a list of strings indicating which attributes to retrieve for each matching entry. If nil return all available attributes. If ATTRSONLY is non-nil then only the attributes are retrieved, not the associated values. If WITHDN is non-nil each entry in the result will be prepended with its distinguished name DN. If VERBOSE is non-nil progress messages will be echoed. The function returns a list of matching entries. Each entry is itself an alist of attribute/value pairs optionally preceded by the DN of the entry according to the value of WITHDN. */ (ldap, filter, base, scope, attrs, attrsonly, withdn, verbose)) { /* This function can GC */ /* Vars for query */ LDAP *ld; LDAPMessage *e; BerElement *ptr; char *a, *dn; int i, rc; int matches; struct ldap_unwind_struct unwind; int ldap_scope = LDAP_SCOPE_SUBTREE; char **ldap_attributes = NULL; int speccount = specpdl_depth (); Lisp_Object list = Qnil; Lisp_Object entry = Qnil; Lisp_Object result = Qnil; struct gcpro gcpro1, gcpro2, gcpro3; GCPRO3 (list, entry, result); unwind.res = NULL; unwind.vals = NULL; /* Do all the parameter checking */ CHECK_LIVE_LDAP (ldap); ld = XLDAP (ldap)->ld; /* Filter */ CHECK_STRING (filter); /* Search base */ if (NILP (base)) { base = Vldap_default_base; } if (!NILP (base)) { CHECK_STRING (base); } /* Search scope */ if (!NILP (scope)) { if (EQ (scope, Qbase)) ldap_scope = LDAP_SCOPE_BASE; else if (EQ (scope, Qonelevel)) ldap_scope = LDAP_SCOPE_ONELEVEL; else if (EQ (scope, Qsubtree)) ldap_scope = LDAP_SCOPE_SUBTREE; else signal_simple_error ("Invalid scope", scope); } /* Attributes to search */ if (!NILP (attrs)) { CHECK_CONS (attrs); ldap_attributes = alloca_array (char *, 1 + XINT (Flength (attrs))); i = 0; EXTERNAL_LIST_LOOP (attrs, attrs) { Lisp_Object current = XCAR (attrs); CHECK_STRING (current); LISP_STRING_TO_EXTERNAL (current, ldap_attributes[i], Qnative); ++i; } ldap_attributes[i] = NULL; } /* Attributes only ? */ CHECK_SYMBOL (attrsonly); /* Perform the search */ if (ldap_search (ld, NILP (base) ? (char *) "" : (char *) XSTRING_DATA (base), ldap_scope, NILP (filter) ? (char *) "" : (char *) XSTRING_DATA (filter), ldap_attributes, NILP (attrsonly) ? 0 : 1) == -1) { signal_ldap_error (ld, NULL, 0); } /* Ensure we don't exit without cleaning up */ record_unwind_protect (ldap_search_unwind, make_opaque_ptr (&unwind)); /* Build the results list */ matches = 0; rc = ldap_result (ld, LDAP_RES_ANY, 0, NULL, &unwind.res); while (rc == LDAP_RES_SEARCH_ENTRY) { QUIT; matches ++; e = ldap_first_entry (ld, unwind.res); /* #### This call to message() is pretty fascist, because it destroys the current echo area contents, even when invoked from Lisp. It should use echo_area_message() instead, and restore the old echo area contents later. */ if (! NILP (verbose)) message ("Parsing ldap results... %d", matches); entry = Qnil; /* Get the DN if required */ if (! NILP (withdn)) { dn = ldap_get_dn (ld, e); if (dn == NULL) 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, Qnative), Qnil); unwind.vals = ldap_get_values_len (ld, e, a); if (unwind.vals != NULL) { for (i = 0; unwind.vals[i] != NULL; i++) { list = Fcons (make_ext_string ((Extbyte *) unwind.vals[i]->bv_val, unwind.vals[i]->bv_len, Qnative), list); } } entry = Fcons (Fnreverse (list), entry); ldap_value_free_len (unwind.vals); unwind.vals = NULL; } result = Fcons (Fnreverse (entry), result); ldap_msgfree (unwind.res); unwind.res = NULL; rc = ldap_result (ld, LDAP_RES_ANY, 0, NULL, &(unwind.res)); } #if defined HAVE_LDAP_PARSE_RESULT { int rc2 = ldap_parse_result (ld, unwind.res, &rc, NULL, NULL, NULL, NULL, 0); if (rc2 != LDAP_SUCCESS) rc = rc2; } #else if (rc == 0) signal_ldap_error (ld, NULL, LDAP_TIMELIMIT_EXCEEDED); if (rc == -1) signal_ldap_error (ld, unwind.res, (unwind.res==NULL) ? ld->ld_errno : 0); #if defined HAVE_LDAP_RESULT2ERROR rc = ldap_result2error (ld, unwind.res, 0); #endif #endif if (rc != LDAP_SUCCESS) signal_ldap_error (ld, NULL, rc); ldap_msgfree (unwind.res); unwind.res = (LDAPMessage *)NULL; /* #### See above for calling message(). */ if (! NILP (verbose)) message ("Parsing ldap results... done"); unbind_to (speccount, Qnil); UNGCPRO; return Fnreverse (result); } DEFUN ("ldap-add", Fldap_add, 3, 3, 0, /* Add an entry to an LDAP directory. LDAP is an LDAP connection object created with `ldap-open'. DN is the distinguished name of the entry to add. ENTRY is an entry specification, i.e., a list of cons cells containing attribute/value string pairs. */ (ldap, dn, entry)) { LDAP *ld; LDAPMod *ldap_mods, **ldap_mods_ptrs; struct berval *bervals; int rc; int i, j; size_t len; Lisp_Object current = Qnil; Lisp_Object values = Qnil; struct gcpro gcpro1, gcpro2; GCPRO2 (current, values); /* Do all the parameter checking */ CHECK_LIVE_LDAP (ldap); ld = XLDAP (ldap)->ld; /* Check the DN */ CHECK_STRING (dn); /* Check the entry */ CHECK_CONS (entry); if (NILP (entry)) signal_simple_error ("Cannot add void entry", entry); /* Build the ldap_mods array */ len = XINT (Flength (entry)); ldap_mods = alloca_array (LDAPMod, len); ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len); i = 0; EXTERNAL_LIST_LOOP (entry, entry) { current = XCAR (entry); CHECK_CONS (current); CHECK_STRING (XCAR (current)); ldap_mods_ptrs[i] = &(ldap_mods[i]); LISP_STRING_TO_EXTERNAL (XCAR (current), ldap_mods[i].mod_type, Qnative); ldap_mods[i].mod_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES; values = XCDR (current); if (CONSP (values)) { len = XINT (Flength (values)); bervals = alloca_array (struct berval, len); ldap_mods[i].mod_vals.modv_bvals = alloca_array (struct berval *, 1 + len); j = 0; EXTERNAL_LIST_LOOP (values, values) { current = XCAR (values); CHECK_STRING (current); ldap_mods[i].mod_vals.modv_bvals[j] = &(bervals[j]); TO_EXTERNAL_FORMAT (LISP_STRING, current, ALLOCA, (bervals[j].bv_val, bervals[j].bv_len), Qnative); j++; } ldap_mods[i].mod_vals.modv_bvals[j] = NULL; } else { CHECK_STRING (values); bervals = alloca_array (struct berval, 1); ldap_mods[i].mod_vals.modv_bvals = alloca_array (struct berval *, 2); ldap_mods[i].mod_vals.modv_bvals[0] = &(bervals[0]); TO_EXTERNAL_FORMAT (LISP_STRING, values, ALLOCA, (bervals[0].bv_val, bervals[0].bv_len), Qnative); ldap_mods[i].mod_vals.modv_bvals[1] = NULL; } i++; } ldap_mods_ptrs[i] = NULL; rc = ldap_add_s (ld, (char *) XSTRING_DATA (dn), ldap_mods_ptrs); if (rc != LDAP_SUCCESS) signal_ldap_error (ld, NULL, rc); UNGCPRO; return Qnil; } DEFUN ("ldap-modify", Fldap_modify, 3, 3, 0, /* Add an entry to an LDAP directory. LDAP is an LDAP connection object created with `ldap-open'. DN is the distinguished name of the entry to modify. MODS is a list of modifications to apply. A modification is a list of the form (MOD-OP ATTR VALUE1 VALUE2 ...) MOD-OP and ATTR are mandatory, VALUEs are optional depending on MOD-OP. MOD-OP is the type of modification, one of the symbols `add', `delete' or `replace'. ATTR is the LDAP attribute type to modify. */ (ldap, dn, mods)) { LDAP *ld; LDAPMod *ldap_mods, **ldap_mods_ptrs; struct berval *bervals; int i, j, rc; Lisp_Object mod_op; size_t len; Lisp_Object current = Qnil; Lisp_Object values = Qnil; struct gcpro gcpro1, gcpro2; /* Do all the parameter checking */ CHECK_LIVE_LDAP (ldap); ld = XLDAP (ldap)->ld; /* Check the DN */ CHECK_STRING (dn); /* Check the entry */ CHECK_CONS (mods); if (NILP (mods)) return Qnil; /* Build the ldap_mods array */ len = XINT (Flength (mods)); ldap_mods = alloca_array (LDAPMod, len); ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len); i = 0; GCPRO2 (current, values); EXTERNAL_LIST_LOOP (mods, mods) { current = XCAR (mods); CHECK_CONS (current); CHECK_SYMBOL (XCAR (current)); mod_op = XCAR (current); ldap_mods_ptrs[i] = &(ldap_mods[i]); ldap_mods[i].mod_op = LDAP_MOD_BVALUES; if (EQ (mod_op, Qadd)) ldap_mods[i].mod_op |= LDAP_MOD_ADD; else if (EQ (mod_op, Qdelete)) ldap_mods[i].mod_op |= LDAP_MOD_DELETE; else if (EQ (mod_op, Qreplace)) ldap_mods[i].mod_op |= LDAP_MOD_REPLACE; else signal_simple_error ("Invalid LDAP modification type", mod_op); current = XCDR (current); CHECK_STRING (XCAR (current)); LISP_STRING_TO_EXTERNAL (XCAR (current), ldap_mods[i].mod_type, Qnative); values = XCDR (current); len = XINT (Flength (values)); bervals = alloca_array (struct berval, len); ldap_mods[i].mod_vals.modv_bvals = alloca_array (struct berval *, 1 + len); j = 0; EXTERNAL_LIST_LOOP (values, values) { current = XCAR (values); CHECK_STRING (current); ldap_mods[i].mod_vals.modv_bvals[j] = &(bervals[j]); TO_EXTERNAL_FORMAT (LISP_STRING, current, ALLOCA, (bervals[j].bv_val, bervals[j].bv_len), Qnative); j++; } ldap_mods[i].mod_vals.modv_bvals[j] = NULL; i++; } ldap_mods_ptrs[i] = NULL; rc = ldap_modify_s (ld, (char *) XSTRING_DATA (dn), ldap_mods_ptrs); if (rc != LDAP_SUCCESS) signal_ldap_error (ld, NULL, rc); UNGCPRO; return Qnil; } DEFUN ("ldap-delete", Fldap_delete, 2, 2, 0, /* Delete an entry to an LDAP directory. LDAP is an LDAP connection object created with `ldap-open'. DN is the distinguished name of the entry to delete. */ (ldap, dn)) { LDAP *ld; int rc; /* Check parameters */ CHECK_LIVE_LDAP (ldap); ld = XLDAP (ldap)->ld; CHECK_STRING (dn); rc = ldap_delete_s (ld, (char *) XSTRING_DATA (dn)); if (rc != LDAP_SUCCESS) signal_ldap_error (ld, NULL, rc); return Qnil; } void syms_of_eldap (void) { INIT_LRECORD_IMPLEMENTATION (ldap); 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"); defsymbol (&Qadd, "add"); defsymbol (&Qreplace, "replace"); DEFSUBR (Fldapp); DEFSUBR (Fldap_host); DEFSUBR (Fldap_status); DEFSUBR (Fldap_open); DEFSUBR (Fldap_close); DEFSUBR (Fldap_search_basic); DEFSUBR (Fldap_add); DEFSUBR (Fldap_modify); DEFSUBR (Fldap_delete); } void vars_of_eldap (void) { ldap_default_port = LDAP_PORT; Vldap_default_base = Qnil; DEFVAR_INT ("ldap-default-port", &ldap_default_port /* Default TCP port for LDAP connections. Initialized from the LDAP library. Default value is 389. */ ); DEFVAR_LISP ("ldap-default-base", &Vldap_default_base /* Default base for LDAP searches. This is a string using the syntax of RFC 1779. For instance, "o=ACME, c=US" limits the search to the Acme organization in the United States. */ ); }