Mercurial > hg > xemacs-beta

comparison modules/ldap/eldap.c @ 2272:4ec724310f33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-09-14 20:54:29 by james] Eliminate gcc shadow warnings.
author james
date Tue, 14 Sep 2004 20:54:37 +0000
parents 61855263cb07
children 04bc9d2f42c7
comparison
equal deleted inserted replaced
2271:0dfff19d20da 2272:4ec724310f33
216 Lisp_LDAP *ldap; 216 Lisp_LDAP *ldap;
217 LDAP *ld; 217 LDAP *ld;
218 int ldap_port = 0; 218 int ldap_port = 0;
219 int ldap_auth = LDAP_AUTH_SIMPLE; 219 int ldap_auth = LDAP_AUTH_SIMPLE;
220 char *ldap_binddn = NULL; 220 char *ldap_binddn = NULL;
221 char *ldap_passwd = NULL; 221 char *ldap_password = NULL;
222 int ldap_deref = LDAP_DEREF_NEVER; 222 int ldap_deref = LDAP_DEREF_NEVER;
223 int ldap_timelimit = 0; 223 int ldap_timelimit = 0;
224 int ldap_sizelimit = 0; 224 int ldap_sizelimit = 0;
225 int err; 225 int err;
226 226
259 } 259 }
260 /* Password */ 260 /* Password */
261 else if (EQ (keyword, Qpasswd)) 261 else if (EQ (keyword, Qpasswd))
262 { 262 {
263 CHECK_STRING (value); 263 CHECK_STRING (value);
264 LISP_STRING_TO_EXTERNAL (value, ldap_passwd, Qnative); 264 LISP_STRING_TO_EXTERNAL (value, ldap_password, Qnative);
265 } 265 }
266 /* Deref */ 266 /* Deref */
267 else if (EQ (keyword, Qderef)) 267 else if (EQ (keyword, Qderef))
268 { 268 {
269 if (EQ (value, Qnever)) 269 if (EQ (value, Qnever))
332 #endif /* not LDAP_REFERRALS */ 332 #endif /* not LDAP_REFERRALS */
333 /* XEmacs uses interrupts (SIGIO,SIGALRM), LDAP calls need to ignore them */ 333 /* XEmacs uses interrupts (SIGIO,SIGALRM), LDAP calls need to ignore them */
334 ld->ld_options |= LDAP_OPT_RESTART; 334 ld->ld_options |= LDAP_OPT_RESTART;
335 #endif /* not HAVE_LDAP_SET_OPTION */ 335 #endif /* not HAVE_LDAP_SET_OPTION */
336 336
337 err = ldap_bind_s (ld, ldap_binddn, ldap_passwd, ldap_auth); 337 err = ldap_bind_s (ld, ldap_binddn, ldap_password, ldap_auth);
338 if (err != LDAP_SUCCESS) 338 if (err != LDAP_SUCCESS)
339 { 339 {
340 Ibyte *interrmess; 340 Ibyte *interrmess;
341 EXTERNAL_TO_C_STRING (ldap_err2string (err), interrmess, Qnative); 341 EXTERNAL_TO_C_STRING (ldap_err2string (err), interrmess, Qnative);
342 signal_error (Qprocess_error, "Failed binding to the server", 342 signal_error (Qprocess_error, "Failed binding to the server",