comparison modules/ldap/eldap.c @ 5119:d877c14318b3 ben-lisp-object

merge in latest-fix changes
author Ben Wing <ben@xemacs.org>
date Sat, 26 Dec 2009 21:22:48 -0600
parents e0db3c197671 c12b646d84ee
children d1247f3cc363
comparison
equal deleted inserted replaced
5118:e0db3c197671 5119:d877c14318b3
495 495
496 /* Attributes only ? */ 496 /* Attributes only ? */
497 CHECK_SYMBOL (attrsonly); 497 CHECK_SYMBOL (attrsonly);
498 498
499 /* Perform the search */ 499 /* Perform the search */
500 bs = NILP (base) ? "" : NEW_LISP_STRING_TO_EXTERNAL (base, Qnative); 500 bs = NILP (base) ? (Extbyte *) "" :
501 filt = NILP (filter) ? "" : NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative); 501 NEW_LISP_STRING_TO_EXTERNAL (base, Qnative);
502 filt = NILP (filter) ? (Extbyte *) "" :
503 NEW_LISP_STRING_TO_EXTERNAL (filter, Qnative);
502 if (ldap_search (ld, bs, ldap_scope, filt, ldap_attributes, 504 if (ldap_search (ld, bs, ldap_scope, filt, ldap_attributes,
503 NILP (attrsonly) ? 0 : 1) 505 NILP (attrsonly) ? 0 : 1)
504 == -1) 506 == -1)
505 { 507 {
506 signal_ldap_error (ld, NULL, 0); 508 signal_ldap_error (ld, NULL, 0);