comparison modules/ldap/eldap.c @ 2367:ecf1ebac70d8

[xemacs-hg @ 2004-11-04 23:05:23 by ben] commit mega-patch configure.in: Turn off -Winline and -Wchar-subscripts. Use the right set of cflags when compiling modules. Rewrite ldap configuration to separate the inclusion of lber (needed in recent Cygwin) from the basic checks for the needed libraries. add a function for MAKE_JUNK_C; initially code was added to generate xemacs.def using this, but it will need to be rewritten. add an rm -f for junk.c to avoid weird Cygwin bug with cp -f onto an existing file. Sort list of auto-detected functions and eliminate unused checks for stpcpy, setlocale and getwd. Add autodetection of Cygwin scanf problems BETA: Rewrite section on configure to indicate what flags are important and what not. digest-doc.c, make-dump-id.c, profile.c, sorted-doc.c: Add proper decls for main(). make-msgfile.c: Document that this is old junk. Move proposal to text.c. make-msgfile.lex: Move proposal to text.c. make-mswin-unicode.pl: Convert error-generating code so that the entire message will be seen as a single unrecognized token. mule/mule-ccl.el: Update docs. lispref/mule.texi: Update CCL docs. ldap/eldap.c: Mule-ize. Use EXTERNAL_LIST_LOOP_2 instead of deleted EXTERNAL_LIST_LOOP. * XEmacs 21.5.18 "chestnut" is released. --------------------------------------------------------------- MULE-RELATED WORK: --------------------------------------------------------------- --------------------------- byte-char conversion --------------------------- buffer.c, buffer.h, insdel.c, text.c: Port FSF algorithm for byte-char conversion, replacing broken previous version. Track the char position of the gap. Add functions to do char-byte conversion downwards as well as upwards. Move comments about algorithm workings to internals manual. --------------------------- work on types --------------------------- alloc.c, console-x-impl.h, dump-data.c, dump-data.h, dumper.c, dialog-msw.c, dired-msw.c, doc.c, editfns.c, esd.c, event-gtk.h, event-msw.c, events.c, file-coding.c, file-coding.h, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-shared.c, glyphs-x.c, glyphs.c, glyphs.h, gui.c, hpplay.c, imgproc.c, intl-win32.c, lrecord.h, lstream.c, keymap.c, lisp.h, libsst.c, linuxplay.c, miscplay.c, miscplay.h, mule-coding.c, nas.c, nt.c, ntheap.c, ntplay.c, objects-msw.c, objects-tty.c, objects-x.c, print.c, process-nt.c, process.c, redisplay.h, select-common.h, select-gtk.c, select-x.c, sgiplay.c, sound.c, sound.h, sunplay.c, sysfile.h, sysdep.c, syswindows.h, text.c, unexnt.c, win32.c, xgccache.c: Further work on types. This creates a full set of types for all the basic semantics of `char' that I have so far identified, so that its semantics can always be identified for the purposes of proper Mule-safe code, and the raw use of `char' always avoided. (1) More type renaming, for consistency of naming. Char_ASCII -> Ascbyte UChar_ASCII -> UAscbyte Char_Binary -> CBinbyte UChar_Binary -> Binbyte SChar_Binary -> SBinbyte (2) Introduce Rawbyte, CRawbyte, Boolbyte, Chbyte, UChbyte, and Bitbyte and use them. (3) New types Itext, Wexttext and Textcount for separating out the concepts of bytes and textual units (different under UTF-16 and UTF-32, which are potential internal encodings). (4) qxestr*_c -> qxestr*_ascii. lisp.h: New; goes with other qxe() functions. #### Maybe goes in a different section. lisp.h: Group generic int-type defs together with EMACS_INT defs. lisp.h: * lisp.h (WEXTTEXT_IS_WIDE) New defns. lisp.h: New type to replace places where int occurs as a boolean. It's signed because occasionally people may want to use -1 as an error value, and because unsigned ints are viral -- see comments in the internals manual against using them. dynarr.c: int -> Bytecount. --------------------------- Mule-izing --------------------------- device-x.c: Partially Mule-ize. dumper.c, dumper.h: Mule-ize. Use Rawbyte. Use stderr_out not printf. Use wext_*(). sysdep.c, syswindows.h, text.c: New Wexttext API for manipulation of external text that may be Unicode (e.g. startup code under Windows). emacs.c: Mule-ize. Properly deal with argv in external encoding. Use wext_*() and Wexttext. Use Rawbyte. #if 0 some old junk on SCO that is unlikely to be correct. Rewrite allocation code in run-temacs. emacs.c, symsinit.h, win32.c: Rename win32 init function and call it even earlier, to initialize mswindows_9x_p even earlier, for use in startup code (XEUNICODE_P). process.c: Use _wenviron not environ under Windows, to get Unicode environment variables. event-Xt.c: Mule-ize drag-n-drop related stuff. dragdrop.c, dragdrop.h, frame-x.c: Mule-ize. text.h: Add some more stand-in defines for particular kinds of conversion; use in Mule-ization work in frame-x.c etc. --------------------------- Freshening --------------------------- intl-auto-encap-win32.c, intl-auto-encap-win32.h: Regenerate. --------------------------- Unicode-work --------------------------- intl-win32.c, syswindows.h: Factor out common options to MultiByteToWideChar and WideCharToMultiByte. Add convert_unicode_to_multibyte_malloc() and convert_unicode_to_multibyte_dynarr() and use. Add stuff for alloca() conversion of multibyte/unicode. alloc.c: Use dfc_external_data_len() in case of unicode coding system. alloc.c, mule-charset.c: Don't zero out and reinit charset Unicode tables. This fucks up dump-time loading. Anyway, either we load them at dump time or run time, never both. unicode.c: Dump the blank tables as well. --------------------------------------------------------------- DOCUMENTATION, MOSTLY MULE-RELATED: --------------------------------------------------------------- EmacsFrame.c, emodules.c, event-Xt.c, fileio.c, input-method-xlib.c, mule-wnnfns.c, redisplay-gtk.c, redisplay-tty.c, redisplay-x.c, regex.c, sysdep.c: Add comment about Mule work needed. text.h: Add more documentation describing why DFC routines were not written to return their value. Add some other DFC documentation. console-msw.c, console-msw.h: Add pointer to docs in win32.c. emacs.c: Add comments on sources of doc info. text.c, charset.h, unicode.c, intl-win32.c, intl-encap-win32.c, text.h, file-coding.c, mule-coding.c: Collect background comments and related to text matters and internationalization, and proposals for work to be done, in text.c or Internals manual, stuff related to specific textual API's in text.h, and stuff related to internal implementation of Unicode conversion in unicode.c. Put lots of pointers to the comments to make them easier to find. s/mingw32.h, s/win32-common.h, s/win32-native.h, s/windowsnt.h, win32.c: Add bunches of new documentation on the different kinds of builds and environments under Windows and how they work. Collect this info in win32.c. Add pointers to these docs in the relevant s/* files. emacs.c: Document places with long comments. Remove comment about exiting, move to internals manual, put in pointer. event-stream.c: Move docs about event queues and focus to internals manual, put in pointer. events.h: Move docs about event stream callbacks to internals manual, put in pointer. profile.c, redisplay.c, signal.c: Move documentation to the Internals manual. process-nt.c: Add pointer to comment in win32-native.el. lisp.h: Add comments about some comment conventions. lisp.h: Add comment about the second argument. device-msw.c, redisplay-msw.c: @@#### comments are out-of-date. --------------------------------------------------------------- PDUMP WORK (MOTIVATED BY UNICODE CHANGES) --------------------------------------------------------------- alloc.c, buffer.c, bytecode.c, console-impl.h, console.c, device.c, dumper.c, lrecord.h, elhash.c, emodules.h, events.c, extents.c, frame.c, glyphs.c, glyphs.h, mule-charset.c, mule-coding.c, objects.c, profile.c, rangetab.c, redisplay.c, specifier.c, specifier.h, window.c, lstream.c, file-coding.h, file-coding.c: PDUMP: Properly implement dump_add_root_block(), which never worked before, and is necessary for dumping Unicode tables. Pdump name changes for accuracy: XD_STRUCT_PTR -> XD_BLOCK_PTR. XD_STRUCT_ARRAY -> XD_BLOCK_ARRAY. XD_C_STRING -> XD_ASCII_STRING. *_structure_* -> *_block_*. lrecord.h: some comments added about dump_add_root_block() vs dump_add_root_block_ptr(). extents.c: remove incorrect comment about pdump problems with gap array. --------------------------------------------------------------- ALLOCATION --------------------------------------------------------------- abbrev.c, alloc.c, bytecode.c, casefiddle.c, device-msw.c, device-x.c, dired-msw.c, doc.c, doprnt.c, dragdrop.c, editfns.c, emodules.c, file-coding.c, fileio.c, filelock.c, fns.c, glyphs-eimage.c, glyphs-gtk.c, glyphs-msw.c, glyphs-x.c, gui-msw.c, gui-x.c, imgproc.c, intl-win32.c, lread.c, menubar-gtk.c, menubar.c, nt.c, objects-msw.c, objects-x.c, print.c, process-nt.c, process-unix.c, process.c, realpath.c, redisplay.c, search.c, select-common.c, symbols.c, sysdep.c, syswindows.h, text.c, text.h, ui-byhand.c: New macros {alloca,xnew}_{itext,{i,ext,raw,bin,asc}bytes} for more convenient allocation of these commonly requested items. Modify functions to use alloca_ibytes, alloca_array, alloca_extbytes, xnew_ibytes, etc. also XREALLOC_ARRAY, xnew. alloc.c: Rewrite the allocation functions to factor out repeated code. Add assertions for freeing dumped data. lisp.h: Moved down and consolidated with other allocation stuff. lisp.h, dynarr.c: New functions for allocation that's very efficient when mostly in LIFO order. lisp.h, text.c, text.h: Factor out some stuff for general use by alloca()-conversion funs. text.h, lisp.h: Fill out convenience routines for allocating various kinds of bytes and put them in lisp.h. Use them in place of xmalloc(), ALLOCA(). text.h: Fill out the convenience functions so the _MALLOC() kinds match the alloca() kinds. --------------------------------------------------------------- ERROR-CHECKING --------------------------------------------------------------- text.h: Create ASSERT_ASCTEXT_ASCII() and ASSERT_ASCTEXT_ASCII_LEN() from similar Eistring checkers and change the Eistring checkers to use them instead. --------------------------------------------------------------- MACROS IN LISP.H --------------------------------------------------------------- lisp.h: Redo GCPRO declarations. Create a "base" set of functions that can be used to generate any kind of gcpro sets -- regular, ngcpro, nngcpro, private ones used in GC_EXTERNAL_LIST_LOOP_2. buffer.c, callint.c, chartab.c, console-msw.c, device-x.c, dialog-msw.c, dired.c, extents.c, ui-gtk.c, rangetab.c, nt.c, mule-coding.c, minibuf.c, menubar-msw.c, menubar.c, menubar-gtk.c, lread.c, lisp.h, gutter.c, glyphs.c, glyphs-widget.c, fns.c, fileio.c, file-coding.c, specifier.c: Eliminate EXTERNAL_LIST_LOOP, which does not check for circularities. Use EXTERNAL_LIST_LOOP_2 instead or EXTERNAL_LIST_LOOP_3 or EXTERNAL_PROPERTY_LIST_LOOP_3 or GC_EXTERNAL_LIST_LOOP_2 (new macro). Removed/redid comments on EXTERNAL_LIST_LOOP. --------------------------------------------------------------- SPACING FIXES --------------------------------------------------------------- callint.c, hftctl.c, number-gmp.c, process-unix.c: Spacing fixes. --------------------------------------------------------------- FIX FOR GEOMETRY PROBLEM IN FIRST FRAME --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. toolbar.c: bug fix for problem of initial frame being 77 chars wide on Windows. will be overridden by my other ws. --------------------------------------------------------------- FIX FOR LEAKING PROCESS HANDLES: --------------------------------------------------------------- process-nt.c: Fixes for leaking handles. Inspired by work done by Adrian Aichner <adrian@xemacs.org>. --------------------------------------------------------------- FIX FOR CYGWIN BUG (Unicode-related): --------------------------------------------------------------- unicode.c: Add workaround for newlib bug in sscanf() [should be fixed by release 1.5.12 of Cygwin]. --------------------------------------------------------------- WARNING FIXES: --------------------------------------------------------------- console-stream.c: `reinit' is unused. compiler.h, event-msw.c, frame-msw.c, intl-encap-win32.c, text.h: Add stuff to deal with ANSI-aliasing warnings I got. regex.c: Gather includes together to avoid warning. --------------------------------------------------------------- CHANGES TO INITIALIZATION ROUTINES: --------------------------------------------------------------- buffer.c, emacs.c, console.c, debug.c, device-x.c, device.c, dragdrop.c, emodules.c, eval.c, event-Xt.c, event-gtk.c, event-msw.c, event-stream.c, event-tty.c, events.c, extents.c, faces.c, file-coding.c, fileio.c, font-lock.c, frame-msw.c, glyphs-widget.c, glyphs.c, gui-x.c, insdel.c, lread.c, lstream.c, menubar-gtk.c, menubar-x.c, minibuf.c, mule-wnnfns.c, objects-msw.c, objects.c, print.c, scrollbar-x.c, search.c, select-x.c, text.c, undo.c, unicode.c, window.c, symsinit.h: Call reinit_*() functions directly from emacs.c, for clarity. Factor out some redundant init code. Move disallowed stuff that had crept into vars_of_glyphs() into complex_vars_of_glyphs(). Call init_eval_semi_early() from eval.c not in the middle of vars_of_() in emacs.c since there should be no order dependency in the latter calls. --------------------------------------------------------------- ARMAGEDDON: --------------------------------------------------------------- alloc.c, emacs.c, lisp.h, print.c: Rename inhibit_non_essential_printing_operations to inhibit_non_essential_conversion_operations. text.c: Assert on !inhibit_non_essential_conversion_operations. console-msw.c, print.c: Don't do conversion in SetConsoleTitle or FindWindow to avoid problems during armageddon. Put #errors for NON_ASCII_INTERNAL_FORMAT in places where problems would arise. --------------------------------------------------------------- CHANGES TO THE BUILD PROCEDURE: --------------------------------------------------------------- config.h.in, s/cxux.h, s/usg5-4-2.h, m/powerpc.h: Add comment about correct ordering of this file. Rearrange everything to follow this -- put all #undefs together and before the s&m files. Add undefs for HAVE_ALLOCA, C_ALLOCA, BROKEN_ALLOCA_IN_FUNCTION_CALLS, STACK_DIRECTION. Remove unused HAVE_STPCPY, HAVE_GETWD, HAVE_SETLOCALE. m/gec63.h: Deleted; totally broken, not used at all, not in FSF. m/7300.h, m/acorn.h, m/alliant-2800.h, m/alliant.h, m/altos.h, m/amdahl.h, m/apollo.h, m/att3b.h, m/aviion.h, m/celerity.h, m/clipper.h, m/cnvrgnt.h, m/convex.h, m/cydra5.h, m/delta.h, m/delta88k.h, m/dpx2.h, m/elxsi.h, m/ews4800r.h, m/gould.h, m/hp300bsd.h, m/hp800.h, m/hp9000s300.h, m/i860.h, m/ibmps2-aix.h, m/ibmrs6000.h, m/ibmrt-aix.h, m/ibmrt.h, m/intel386.h, m/iris4d.h, m/iris5d.h, m/iris6d.h, m/irist.h, m/isi-ov.h, m/luna88k.h, m/m68k.h, m/masscomp.h, m/mg1.h, m/mips-nec.h, m/mips-siemens.h, m/mips.h, m/news.h, m/nh3000.h, m/nh4000.h, m/ns32000.h, m/orion105.h, m/pfa50.h, m/plexus.h, m/pmax.h, m/powerpc.h, m/pyrmips.h, m/sequent-ptx.h, m/sequent.h, m/sgi-challenge.h, m/symmetry.h, m/tad68k.h, m/tahoe.h, m/targon31.h, m/tekxd88.h, m/template.h, m/tower32.h, m/tower32v3.h, m/ustation.h, m/vax.h, m/wicat.h, m/xps100.h: Delete C_ALLOCA, HAVE_ALLOCA, STACK_DIRECTION, BROKEN_ALLOCA_IN_FUNCTION_CALLS. All of this is auto-detected. When in doubt, I followed recent FSF sources, which also have these things deleted.
author ben
date Thu, 04 Nov 2004 23:08:28 +0000
parents 04bc9d2f42c7
children 7ee6ea4ff5c0
comparison
equal deleted inserted replaced
2366:2a392e0c390a 2367:ecf1ebac70d8
1 /* LDAP client interface for XEmacs. 1 /* LDAP client interface for XEmacs.
2 Copyright (C) 1998 Free Software Foundation, Inc. 2 Copyright (C) 1998 Free Software Foundation, Inc.
3 Copyright (C) 2004 Ben Wing.
4
3 5
4 This file is part of XEmacs. 6 This file is part of XEmacs.
5 7
6 XEmacs is free software; you can redistribute it and/or modify it 8 XEmacs is free software; you can redistribute it and/or modify it
7 under the terms of the GNU General Public License as published by the 9 under the terms of the GNU General Public License as published by the
95 #else 97 #else
96 ldap_err = ld->ld_errno; 98 ldap_err = ld->ld_errno;
97 #endif 99 #endif
98 } 100 }
99 invalid_operation ("LDAP error", 101 invalid_operation ("LDAP error",
100 build_string (ldap_err2string (ldap_err))); 102 build_ext_string (ldap_err2string (ldap_err), Qnative));
101 } 103 }
102 104
103 105
104 /************************************************************************/ 106 /************************************************************************/
105 /* ldap lrecord basic functions */ 107 /* ldap lrecord basic functions */
221 /* This function can GC */ 223 /* This function can GC */
222 Lisp_LDAP *ldap; 224 Lisp_LDAP *ldap;
223 LDAP *ld; 225 LDAP *ld;
224 int ldap_port = 0; 226 int ldap_port = 0;
225 int ldap_auth = LDAP_AUTH_SIMPLE; 227 int ldap_auth = LDAP_AUTH_SIMPLE;
226 char *ldap_binddn = NULL; 228 Extbyte *ldap_binddn = NULL;
227 char *ldap_password = NULL; 229 Extbyte *ldap_password = NULL;
228 int ldap_deref = LDAP_DEREF_NEVER; 230 int ldap_deref = LDAP_DEREF_NEVER;
229 int ldap_timelimit = 0; 231 int ldap_timelimit = 0;
230 int ldap_sizelimit = 0; 232 int ldap_sizelimit = 0;
231 int err; 233 int err;
232 234
303 ldap_port = ldap_default_port; 305 ldap_port = ldap_default_port;
304 } 306 }
305 307
306 /* Connect to the server and bind */ 308 /* Connect to the server and bind */
307 slow_down_interrupts (); 309 slow_down_interrupts ();
308 ld = ldap_open ((char *) XSTRING_DATA (host), ldap_port); 310 ld = ldap_open (NEW_LISP_STRING_TO_EXTERNAL (host, Qnative), ldap_port);
309 speed_up_interrupts (); 311 speed_up_interrupts ();
310 312
311 if (ld == NULL ) 313 if (ld == NULL )
312 report_process_error ("Failed connecting to host", host); 314 report_process_error ("Failed connecting to host", host);
313 315
341 #endif /* not HAVE_LDAP_SET_OPTION */ 343 #endif /* not HAVE_LDAP_SET_OPTION */
342 344
343 err = ldap_bind_s (ld, ldap_binddn, ldap_password, ldap_auth); 345 err = ldap_bind_s (ld, ldap_binddn, ldap_password, ldap_auth);
344 if (err != LDAP_SUCCESS) 346 if (err != LDAP_SUCCESS)
345 { 347 {
346 Ibyte *interrmess;
347 EXTERNAL_TO_C_STRING (ldap_err2string (err), interrmess, Qnative);
348 signal_error (Qprocess_error, "Failed binding to the server", 348 signal_error (Qprocess_error, "Failed binding to the server",
349 build_intstring (interrmess)); 349 build_ext_string (ldap_err2string (err), Qnative));
350 } 350 }
351 351
352 ldap = allocate_ldap (); 352 ldap = allocate_ldap ();
353 ldap->ld = ld; 353 ldap->ld = ld;
354 ldap->host = host; 354 ldap->host = host;
423 423
424 /* Vars for query */ 424 /* Vars for query */
425 LDAP *ld; 425 LDAP *ld;
426 LDAPMessage *e; 426 LDAPMessage *e;
427 BerElement *ptr; 427 BerElement *ptr;
428 char *a, *dn; 428 Extbyte *a, *dn;
429 int i, rc; 429 int i, rc;
430 int matches; 430 int matches;
431 struct ldap_unwind_struct unwind; 431 struct ldap_unwind_struct unwind;
432 432
433 int ldap_scope = LDAP_SCOPE_SUBTREE; 433 int ldap_scope = LDAP_SCOPE_SUBTREE;
434 char **ldap_attributes = NULL; 434 Extbyte **ldap_attributes = NULL;
435 435
436 int speccount = specpdl_depth (); 436 int speccount = specpdl_depth ();
437 437
438 Lisp_Object list = Qnil; 438 Lisp_Object list = Qnil;
439 Lisp_Object entry = Qnil; 439 Lisp_Object entry = Qnil;
480 { 480 {
481 CHECK_CONS (attrs); 481 CHECK_CONS (attrs);
482 ldap_attributes = alloca_array (char *, 1 + XINT (Flength (attrs))); 482 ldap_attributes = alloca_array (char *, 1 + XINT (Flength (attrs)));
483 483
484 i = 0; 484 i = 0;
485 EXTERNAL_LIST_LOOP (attrs, attrs) 485 {
486 { 486 EXTERNAL_LIST_LOOP_2 (current, attrs)
487 Lisp_Object current = XCAR (attrs); 487 {
488 CHECK_STRING (current); 488 CHECK_STRING (current);
489 LISP_STRING_TO_EXTERNAL (current, ldap_attributes[i], Qnative); 489 LISP_STRING_TO_EXTERNAL (current, ldap_attributes[i], Qnative);
490 ++i; 490 ++i;
491 } 491 }
492 }
492 ldap_attributes[i] = NULL; 493 ldap_attributes[i] = NULL;
493 } 494 }
494 495
495 /* Attributes only ? */ 496 /* Attributes only ? */
496 CHECK_SYMBOL (attrsonly); 497 CHECK_SYMBOL (attrsonly);
497 498
498 /* Perform the search */ 499 /* Perform the search */
499 if (ldap_search (ld, 500 if (ldap_search (ld,
500 NILP (base) ? (char *) "" : (char *) XSTRING_DATA (base), 501 NILP (base) ? "" :
502 NEW_LISP_STRING_TO_EXTERNAL (base, Qnative),
501 ldap_scope, 503 ldap_scope,
502 NILP (filter) ? (char *) "" : (char *) XSTRING_DATA (filter), 504 NILP (filter) ? "" :
505 NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative),
503 ldap_attributes, 506 ldap_attributes,
504 NILP (attrsonly) ? 0 : 1) 507 NILP (attrsonly) ? 0 : 1)
505 == -1) 508 == -1)
506 { 509 {
507 signal_ldap_error (ld, NULL, 0); 510 signal_ldap_error (ld, NULL, 0);
534 dn = ldap_get_dn (ld, e); 537 dn = ldap_get_dn (ld, e);
535 if (dn == NULL) 538 if (dn == NULL)
536 signal_ldap_error (ld, e, 0); 539 signal_ldap_error (ld, e, 0);
537 entry = Fcons (build_ext_string (dn, Qnative), Qnil); 540 entry = Fcons (build_ext_string (dn, Qnative), Qnil);
538 } 541 }
539 for (a= ldap_first_attribute (ld, e, &ptr); 542 for (a = ldap_first_attribute (ld, e, &ptr);
540 a != NULL; 543 a != NULL;
541 a = ldap_next_attribute (ld, e, ptr) ) 544 a = ldap_next_attribute (ld, e, ptr))
542 { 545 {
543 list = Fcons (build_ext_string (a, Qnative), Qnil); 546 list = Fcons (build_ext_string (a, Qnative), Qnil);
544 unwind.vals = ldap_get_values_len (ld, e, a); 547 unwind.vals = ldap_get_values_len (ld, e, a);
545 if (unwind.vals != NULL) 548 if (unwind.vals != NULL)
546 { 549 {
616 int i, j; 619 int i, j;
617 Elemcount len; 620 Elemcount len;
618 621
619 Lisp_Object current = Qnil; 622 Lisp_Object current = Qnil;
620 Lisp_Object values = Qnil; 623 Lisp_Object values = Qnil;
621 struct gcpro gcpro1, gcpro2; 624 struct gcpro gcpro1;
622 625
623 GCPRO2 (current, values); 626 GCPRO1 (values);
624 627
625 /* Do all the parameter checking */ 628 /* Do all the parameter checking */
626 CHECK_LIVE_LDAP (ldap); 629 CHECK_LIVE_LDAP (ldap);
627 ld = XLDAP (ldap)->ld; 630 ld = XLDAP (ldap)->ld;
628 631
637 /* Build the ldap_mods array */ 640 /* Build the ldap_mods array */
638 len = (Elemcount) XINT (Flength (entry)); 641 len = (Elemcount) XINT (Flength (entry));
639 ldap_mods = alloca_array (LDAPMod, len); 642 ldap_mods = alloca_array (LDAPMod, len);
640 ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len); 643 ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len);
641 i = 0; 644 i = 0;
642 EXTERNAL_LIST_LOOP (entry, entry) 645
643 { 646 {
644 current = XCAR (entry); 647 EXTERNAL_LIST_LOOP_2 (current, entry)
645 CHECK_CONS (current); 648 {
646 CHECK_STRING (XCAR (current)); 649 CHECK_CONS (current);
647 ldap_mods_ptrs[i] = &(ldap_mods[i]); 650 CHECK_STRING (XCAR (current));
648 LISP_STRING_TO_EXTERNAL (XCAR (current), ldap_mods[i].mod_type, Qnative); 651 ldap_mods_ptrs[i] = &(ldap_mods[i]);
649 ldap_mods[i].mod_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES; 652 LISP_STRING_TO_EXTERNAL (XCAR (current), ldap_mods[i].mod_type,
650 values = XCDR (current); 653 Qnative);
651 if (CONSP (values)) 654 ldap_mods[i].mod_op = LDAP_MOD_ADD | LDAP_MOD_BVALUES;
652 { 655 values = XCDR (current);
653 len = (Elemcount) XINT (Flength (values)); 656 if (CONSP (values))
654 bervals = alloca_array (struct berval, len); 657 {
655 ldap_mods[i].mod_vals.modv_bvals = 658 len = (Elemcount) XINT (Flength (values));
656 alloca_array (struct berval *, 1 + len); 659 bervals = alloca_array (struct berval, len);
657 j = 0; 660 ldap_mods[i].mod_vals.modv_bvals =
658 EXTERNAL_LIST_LOOP (values, values) 661 alloca_array (struct berval *, 1 + len);
659 { 662 j = 0;
660 current = XCAR (values); 663 {
661 CHECK_STRING (current); 664 EXTERNAL_LIST_LOOP_2 (cur2, values)
662 ldap_mods[i].mod_vals.modv_bvals[j] = &(bervals[j]); 665 {
663 TO_EXTERNAL_FORMAT (LISP_STRING, current, 666 CHECK_STRING (cur2);
664 ALLOCA, (bervals[j].bv_val, 667 ldap_mods[i].mod_vals.modv_bvals[j] = &(bervals[j]);
665 bervals[j].bv_len), 668 TO_EXTERNAL_FORMAT (LISP_STRING, cur2,
666 Qnative); 669 ALLOCA, (bervals[j].bv_val,
667 j++; 670 bervals[j].bv_len),
668 } 671 Qnative);
669 ldap_mods[i].mod_vals.modv_bvals[j] = NULL; 672 j++;
670 } 673 }
671 else 674 }
672 { 675 ldap_mods[i].mod_vals.modv_bvals[j] = NULL;
673 CHECK_STRING (values); 676 }
674 bervals = alloca_array (struct berval, 1); 677 else
675 ldap_mods[i].mod_vals.modv_bvals = alloca_array (struct berval *, 2); 678 {
676 ldap_mods[i].mod_vals.modv_bvals[0] = &(bervals[0]); 679 CHECK_STRING (values);
677 TO_EXTERNAL_FORMAT (LISP_STRING, values, 680 bervals = alloca_array (struct berval, 1);
678 ALLOCA, (bervals[0].bv_val, 681 ldap_mods[i].mod_vals.modv_bvals = alloca_array (struct berval *,
679 bervals[0].bv_len), 682 2);
680 Qnative); 683 ldap_mods[i].mod_vals.modv_bvals[0] = &(bervals[0]);
681 ldap_mods[i].mod_vals.modv_bvals[1] = NULL; 684 TO_EXTERNAL_FORMAT (LISP_STRING, values,
682 } 685 ALLOCA, (bervals[0].bv_val,
683 i++; 686 bervals[0].bv_len),
684 } 687 Qnative);
688 ldap_mods[i].mod_vals.modv_bvals[1] = NULL;
689 }
690 i++;
691 }
692 }
685 ldap_mods_ptrs[i] = NULL; 693 ldap_mods_ptrs[i] = NULL;
686 rc = ldap_add_s (ld, (char *) XSTRING_DATA (dn), ldap_mods_ptrs); 694 rc = ldap_add_s (ld, NEW_LISP_STRING_TO_EXTERNAL (dn, Qnative),
695 ldap_mods_ptrs);
687 if (rc != LDAP_SUCCESS) 696 if (rc != LDAP_SUCCESS)
688 signal_ldap_error (ld, NULL, rc); 697 signal_ldap_error (ld, NULL, rc);
689 698
690 UNGCPRO; 699 UNGCPRO;
691 return Qnil; 700 return Qnil;
708 struct berval *bervals; 717 struct berval *bervals;
709 int i, j, rc; 718 int i, j, rc;
710 Lisp_Object mod_op; 719 Lisp_Object mod_op;
711 Elemcount len; 720 Elemcount len;
712 721
713 Lisp_Object current = Qnil;
714 Lisp_Object values = Qnil; 722 Lisp_Object values = Qnil;
715 struct gcpro gcpro1, gcpro2; 723 struct gcpro gcpro1, gcpro2;
716 724
717 /* Do all the parameter checking */ 725 /* Do all the parameter checking */
718 CHECK_LIVE_LDAP (ldap); 726 CHECK_LIVE_LDAP (ldap);
730 len = (Elemcount) XINT (Flength (mods)); 738 len = (Elemcount) XINT (Flength (mods));
731 ldap_mods = alloca_array (LDAPMod, len); 739 ldap_mods = alloca_array (LDAPMod, len);
732 ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len); 740 ldap_mods_ptrs = alloca_array (LDAPMod *, 1 + len);
733 i = 0; 741 i = 0;
734 742
735 GCPRO2 (current, values); 743 GCPRO1 (values);
736 EXTERNAL_LIST_LOOP (mods, mods) 744 {
737 { 745 EXTERNAL_LIST_LOOP_2 (current, mods)
738 current = XCAR (mods); 746 {
739 CHECK_CONS (current); 747 CHECK_CONS (current);
740 CHECK_SYMBOL (XCAR (current)); 748 CHECK_SYMBOL (XCAR (current));
741 mod_op = XCAR (current); 749 mod_op = XCAR (current);
742 ldap_mods_ptrs[i] = &(ldap_mods[i]); 750 ldap_mods_ptrs[i] = &(ldap_mods[i]);
743 ldap_mods[i].mod_op = LDAP_MOD_BVALUES; 751 ldap_mods[i].mod_op = LDAP_MOD_BVALUES;
744 if (EQ (mod_op, Qadd)) 752 if (EQ (mod_op, Qadd))
745 ldap_mods[i].mod_op |= LDAP_MOD_ADD; 753 ldap_mods[i].mod_op |= LDAP_MOD_ADD;
746 else if (EQ (mod_op, Qdelete)) 754 else if (EQ (mod_op, Qdelete))
747 ldap_mods[i].mod_op |= LDAP_MOD_DELETE; 755 ldap_mods[i].mod_op |= LDAP_MOD_DELETE;
748 else if (EQ (mod_op, Qreplace)) 756 else if (EQ (mod_op, Qreplace))
749 ldap_mods[i].mod_op |= LDAP_MOD_REPLACE; 757 ldap_mods[i].mod_op |= LDAP_MOD_REPLACE;
750 else 758 else
751 invalid_constant ("Invalid LDAP modification type", mod_op); 759 invalid_constant ("Invalid LDAP modification type", mod_op);
752 current = XCDR (current); 760 current = XCDR (current);
753 CHECK_STRING (XCAR (current)); 761 CHECK_STRING (XCAR (current));
754 LISP_STRING_TO_EXTERNAL (XCAR (current), ldap_mods[i].mod_type, Qnative); 762 LISP_STRING_TO_EXTERNAL (XCAR (current), ldap_mods[i].mod_type,
755 values = XCDR (current); 763 Qnative);
756 len = (Elemcount) XINT (Flength (values)); 764 values = XCDR (current);
757 bervals = alloca_array (struct berval, len); 765 len = (Elemcount) XINT (Flength (values));
758 ldap_mods[i].mod_vals.modv_bvals = 766 bervals = alloca_array (struct berval, len);
759 alloca_array (struct berval *, 1 + len); 767 ldap_mods[i].mod_vals.modv_bvals =
760 j = 0; 768 alloca_array (struct berval *, 1 + len);
761 EXTERNAL_LIST_LOOP (values, values) 769 j = 0;
762 { 770 EXTERNAL_LIST_LOOP_2 (cur2, values)
763 current = XCAR (values); 771 {
764 CHECK_STRING (current); 772 CHECK_STRING (cur2);
765 ldap_mods[i].mod_vals.modv_bvals[j] = &(bervals[j]); 773 ldap_mods[i].mod_vals.modv_bvals[j] = &(bervals[j]);
766 TO_EXTERNAL_FORMAT (LISP_STRING, current, 774 TO_EXTERNAL_FORMAT (LISP_STRING, cur2,
767 ALLOCA, (bervals[j].bv_val, 775 ALLOCA, (bervals[j].bv_val,
768 bervals[j].bv_len), 776 bervals[j].bv_len),
769 Qnative); 777 Qnative);
770 j++; 778 j++;
771 } 779 }
772 ldap_mods[i].mod_vals.modv_bvals[j] = NULL; 780 ldap_mods[i].mod_vals.modv_bvals[j] = NULL;
773 i++; 781 i++;
774 } 782 }
783 }
775 ldap_mods_ptrs[i] = NULL; 784 ldap_mods_ptrs[i] = NULL;
776 rc = ldap_modify_s (ld, (char *) XSTRING_DATA (dn), ldap_mods_ptrs); 785 rc = ldap_modify_s (ld, NEW_LISP_STRING_TO_EXTERNAL (dn, Qnative),
786 ldap_mods_ptrs);
777 if (rc != LDAP_SUCCESS) 787 if (rc != LDAP_SUCCESS)
778 signal_ldap_error (ld, NULL, rc); 788 signal_ldap_error (ld, NULL, rc);
779 789
780 UNGCPRO; 790 UNGCPRO;
781 return Qnil; 791 return Qnil;
795 /* Check parameters */ 805 /* Check parameters */
796 CHECK_LIVE_LDAP (ldap); 806 CHECK_LIVE_LDAP (ldap);
797 ld = XLDAP (ldap)->ld; 807 ld = XLDAP (ldap)->ld;
798 CHECK_STRING (dn); 808 CHECK_STRING (dn);
799 809
800 rc = ldap_delete_s (ld, (char *) XSTRING_DATA (dn)); 810 rc = ldap_delete_s (ld, NEW_LISP_STRING_TO_EXTERNAL (dn, Qnative));
801 if (rc != LDAP_SUCCESS) 811 if (rc != LDAP_SUCCESS)
802 signal_ldap_error (ld, NULL, rc); 812 signal_ldap_error (ld, NULL, rc);
803 813
804 return Qnil; 814 return Qnil;
805 } 815 }