diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2002-08-28 17:57:52 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2002-08-28 17:57:52 +0000 |
| commit | 39e311b2e17a53f7ed02fcbe3820ca77b65486d5 (patch) | |
| tree | 917921b3db147e850cc818686dc5ee3127c9842b /contrib/sendmail/libsm | |
| parent | fc4e7b69e3f764d3a1d9157868bc6965ef1db7d6 (diff) | |
| download | FreeBSD-src-39e311b2e17a53f7ed02fcbe3820ca77b65486d5.zip FreeBSD-src-39e311b2e17a53f7ed02fcbe3820ca77b65486d5.tar.gz | |
Import sendmail 8.12.6
Diffstat (limited to 'contrib/sendmail/libsm')
| -rw-r--r-- | contrib/sendmail/libsm/clock.c | 4 | ||||
| -rw-r--r-- | contrib/sendmail/libsm/ldap.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/contrib/sendmail/libsm/clock.c b/contrib/sendmail/libsm/clock.c index fb7e911..4a8bf38 100644 --- a/contrib/sendmail/libsm/clock.c +++ b/contrib/sendmail/libsm/clock.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -12,7 +12,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: clock.c,v 1.35.2.1 2002/06/20 05:14:45 gshapiro Exp $") +SM_RCSID("@(#)$Id: clock.c,v 1.35.2.2 2002/06/27 23:24:20 gshapiro Exp $") #include <unistd.h> #include <time.h> #include <errno.h> diff --git a/contrib/sendmail/libsm/ldap.c b/contrib/sendmail/libsm/ldap.c index 3e85a87..bc426a0 100644 --- a/contrib/sendmail/libsm/ldap.c +++ b/contrib/sendmail/libsm/ldap.c @@ -8,7 +8,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: ldap.c,v 1.44 2002/02/22 21:54:02 gshapiro Exp $") +SM_RCSID("@(#)$Id: ldap.c,v 1.44.2.2 2002/08/09 22:23:12 gshapiro Exp $") #if LDAPMAP # include <sys/types.h> @@ -888,7 +888,8 @@ sm_ldap_results(lmap, msgid, flags, delim, rpool, result, for (i = 0; vals[i] != NULL; i++) { - if (*resultln > 0) + if (*resultln > 0 && + p < pe) *p++ = (char) delim; if (lmap->ldap_attrsep != '\0') @@ -1162,6 +1163,9 @@ sm_ldap_setopts(ld, lmap) ldap_set_option(ld, LDAP_OPT_REFERRALS, LDAP_OPT_OFF); ldap_set_option(ld, LDAP_OPT_SIZELIMIT, &lmap->ldap_sizelimit); ldap_set_option(ld, LDAP_OPT_TIMELIMIT, &lmap->ldap_timelimit); +# ifdef LDAP_OPT_RESTART + ldap_set_option(ld, LDAP_OPT_RESTART, LDAP_OPT_ON); +# endif /* LDAP_OPT_RESTART */ # else /* USE_LDAP_SET_OPTION */ /* From here on in we can use ldap internal timelimits */ ld->ld_deref = lmap->ldap_deref; |
