diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2004-01-19 01:41:15 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2004-01-19 01:41:15 +0000 |
| commit | 6792a0541d8ae3784572478b89043dd72c01867f (patch) | |
| tree | 4be36813992ba71c83e78e4a8b144709edfd1f4b /gnu/usr.sbin/sendmail/libsm | |
| parent | 44556ed4f297a8bb4fa0fbdadde9afcd17bb988d (diff) | |
Update to sendmail 8.12.11. I've been runninga beta version of this for
some time without problems. See the RELEASE_NOTES for the change log.
Diffstat (limited to 'gnu/usr.sbin/sendmail/libsm')
| -rw-r--r-- | gnu/usr.sbin/sendmail/libsm/assert.c | 6 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/libsm/exc.c | 6 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/libsm/ldap.c | 10 | ||||
| -rw-r--r-- | gnu/usr.sbin/sendmail/libsm/local.h | 4 |
4 files changed, 14 insertions, 12 deletions
diff --git a/gnu/usr.sbin/sendmail/libsm/assert.c b/gnu/usr.sbin/sendmail/libsm/assert.c index 56438866e9f..7454a9cd540 100644 --- a/gnu/usr.sbin/sendmail/libsm/assert.c +++ b/gnu/usr.sbin/sendmail/libsm/assert.c @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Sendmail: assert.c,v 1.25 2001/09/11 04:04:47 gshapiro Exp $") +SM_RCSID("@(#)$Sendmail: assert.c,v 1.25.2.1 2003/12/05 22:44:17 ca Exp $") /* ** Abnormal program termination and assertion checking. @@ -127,7 +127,7 @@ sm_abort_sethandler(f) ** doesn't. */ -void +void SM_DEAD_D #if SM_VA_STD sm_abort(char *fmt, ...) #else /* SM_VA_STD */ @@ -163,7 +163,7 @@ sm_abort(fmt, va_alist) ** doesn't. */ -void +void SM_DEAD_D sm_abort_at(filename, lineno, msg) const char *filename; int lineno; diff --git a/gnu/usr.sbin/sendmail/libsm/exc.c b/gnu/usr.sbin/sendmail/libsm/exc.c index c347b1b3d55..1a8e21532e9 100644 --- a/gnu/usr.sbin/sendmail/libsm/exc.c +++ b/gnu/usr.sbin/sendmail/libsm/exc.c @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Sendmail: exc.c,v 1.47 2002/01/09 18:51:43 ca Exp $") +SM_RCSID("@(#)$Sendmail: exc.c,v 1.47.2.1 2003/12/05 22:44:17 ca Exp $") /* ** exception handling @@ -587,7 +587,7 @@ sm_exc_newthread(h) ** doesn't. */ -void +void SM_DEAD_D sm_exc_raise_x(exc) SM_EXC_T *exc; { @@ -648,7 +648,7 @@ sm_exc_raise_x(exc) ** none. */ -void +void SM_DEAD_D #if SM_VA_STD sm_exc_raisenew_x( const SM_EXC_TYPE_T *etype, diff --git a/gnu/usr.sbin/sendmail/libsm/ldap.c b/gnu/usr.sbin/sendmail/libsm/ldap.c index da75b3d2581..f3a6d1b87e2 100644 --- a/gnu/usr.sbin/sendmail/libsm/ldap.c +++ b/gnu/usr.sbin/sendmail/libsm/ldap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -8,7 +8,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Sendmail: ldap.c,v 1.44.2.3 2003/07/07 20:16:16 gshapiro Exp $") +SM_RCSID("@(#)$Sendmail: ldap.c,v 1.44.2.5 2003/12/23 21:21:56 gshapiro Exp $") #if LDAPMAP # include <sys/types.h> @@ -570,9 +570,11 @@ sm_ldap_results(lmap, msgid, flags, delim, rpool, result, ** no need to spin through attributes */ - if (statp == EX_OK && - bitset(SM_LDAP_MATCHONLY, flags)) + if (bitset(SM_LDAP_MATCHONLY, flags)) + { + statp = EX_OK; continue; + } /* record completed DN's to prevent loops */ dn = ldap_get_dn(lmap->ldap_ld, entry); diff --git a/gnu/usr.sbin/sendmail/libsm/local.h b/gnu/usr.sbin/sendmail/libsm/local.h index 21777ddfab9..c6417edf019 100644 --- a/gnu/usr.sbin/sendmail/libsm/local.h +++ b/gnu/usr.sbin/sendmail/libsm/local.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -11,7 +11,7 @@ * forth in the LICENSE file which can be found at the top level of * the sendmail distribution. * - * $Sendmail: local.h,v 1.51.2.1 2002/09/09 21:38:08 gshapiro Exp $ + * $Sendmail: local.h,v 1.51.2.2 2004/01/09 18:32:44 ca Exp $ */ /* |