diff options
Diffstat (limited to 'contrib/sendmail/libsm')
| -rw-r--r-- | contrib/sendmail/libsm/assert.c | 6 | ||||
| -rw-r--r-- | contrib/sendmail/libsm/exc.c | 6 | ||||
| -rw-r--r-- | contrib/sendmail/libsm/ldap.c | 10 | ||||
| -rw-r--r-- | contrib/sendmail/libsm/local.h | 5 |
4 files changed, 14 insertions, 13 deletions
diff --git a/contrib/sendmail/libsm/assert.c b/contrib/sendmail/libsm/assert.c index efad1ec..7ba5c1a 100644 --- a/contrib/sendmail/libsm/assert.c +++ b/contrib/sendmail/libsm/assert.c @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: assert.c,v 1.25 2001/09/11 04:04:47 gshapiro Exp $") +SM_RCSID("@(#)$Id: 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/contrib/sendmail/libsm/exc.c b/contrib/sendmail/libsm/exc.c index 9cc1c6f..e2360c6 100644 --- a/contrib/sendmail/libsm/exc.c +++ b/contrib/sendmail/libsm/exc.c @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: exc.c,v 1.47 2002/01/09 18:51:43 ca Exp $") +SM_RCSID("@(#)$Id: 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/contrib/sendmail/libsm/ldap.c b/contrib/sendmail/libsm/ldap.c index b022b39..0e1c718 100644 --- a/contrib/sendmail/libsm/ldap.c +++ b/contrib/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("@(#)$Id: ldap.c,v 1.44.2.3 2003/07/07 20:16:16 gshapiro Exp $") +SM_RCSID("@(#)$Id: 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/contrib/sendmail/libsm/local.h b/contrib/sendmail/libsm/local.h index 95b5ffe..610663d 100644 --- a/contrib/sendmail/libsm/local.h +++ b/contrib/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. * - * $Id: local.h,v 1.51.2.1 2002/09/09 21:38:08 gshapiro Exp $ + * $Id: local.h,v 1.51.2.2 2004/01/09 18:32:44 ca Exp $ */ /* @@ -37,7 +37,6 @@ int sm_wsetup __P((SM_FILE_T *)); int sm_flags __P((int)); SM_FILE_T *sm_fp __P((const SM_FILE_T *, const int, SM_FILE_T *)); int sm_vprintf __P((int, char const *, va_list)); -int sm_vfscanf __P((SM_FILE_T *, int, char const *, va_list)); /* std io functions */ ssize_t sm_stdread __P((SM_FILE_T *, char *, size_t)); |
