diff options
| author | gshapiro <gshapiro@FreeBSD.org> | 2014-01-26 23:39:11 +0000 |
|---|---|---|
| committer | gshapiro <gshapiro@FreeBSD.org> | 2014-01-26 23:39:11 +0000 |
| commit | 932f20d9d25e87afa88ae9b1d943d25d8083aae5 (patch) | |
| tree | dca7113a5d1aa5eece8c4ac216e345862af0c5f2 /contrib/sendmail/libsm | |
| parent | 631dcff5854868ecf95268f05bcd279ddaa4a5fb (diff) | |
| parent | b649239dd2089ab83c5d6ed19420ee7c788f8647 (diff) | |
| download | FreeBSD-src-932f20d9d25e87afa88ae9b1d943d25d8083aae5.zip FreeBSD-src-932f20d9d25e87afa88ae9b1d943d25d8083aae5.tar.gz | |
Merge sendmail 8.14.8 to HEAD
MFC after: 5 days
Diffstat (limited to 'contrib/sendmail/libsm')
100 files changed, 341 insertions, 210 deletions
diff --git a/contrib/sendmail/libsm/Makefile.m4 b/contrib/sendmail/libsm/Makefile.m4 index 4c7f637..705b6ac 100644 --- a/contrib/sendmail/libsm/Makefile.m4 +++ b/contrib/sendmail/libsm/Makefile.m4 @@ -1,4 +1,4 @@ -dnl $Id: Makefile.m4,v 1.73 2013/03/12 15:24:50 ca Exp $ +dnl $Id: Makefile.m4,v 1.75 2013/08/27 19:02:10 ca Exp $ define(`confREQUIRE_LIBUNIX') include(confBUILDTOOLSDIR`/M4/switch.m4') @@ -6,7 +6,7 @@ define(`confREQUIRE_LIBSM', `true') define(`confREQUIRE_SM_OS_H', `true') PREPENDDEF(`confENVDEF', `confMAPDEF') bldPRODUCT_START(`library', `libsm') -define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c ') +define(`bldSOURCES', ` assert.c debug.c errstring.c exc.c heap.c match.c rpool.c strdup.c strerror.c strl.c clrerr.c fclose.c feof.c ferror.c fflush.c fget.c fpos.c findfp.c flags.c fopen.c fprintf.c fpurge.c fput.c fread.c fscanf.c fseek.c fvwrite.c fwalk.c fwrite.c get.c makebuf.c put.c refill.c rewind.c setvbuf.c smstdio.c snprintf.c sscanf.c stdio.c strio.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vsnprintf.c wbuf.c wsetup.c string.c stringf.c xtrap.c strto.c test.c path.c strcasecmp.c strrevcmp.c signal.c clock.c config.c shm.c sem.c mbdb.c strexit.c cf.c ldap.c niprop.c mpeix.c memstat.c util.c inet6_ntop.c ') bldPRODUCT_END dnl msg.c dnl syslogio.c @@ -31,6 +31,7 @@ smcheck(`t-float', `compile-run') smcheck(`t-scanf', `compile-run') smcheck(`t-shm', `compile-run') smcheck(`t-sem', `compile-run') +smcheck(`t-inet6_ntop', `compile-run') dnl smcheck(`t-msg', `compile-run') smcheck(`t-cf') smcheck(`b-strcmp') diff --git a/contrib/sendmail/libsm/README b/contrib/sendmail/libsm/README index aff25a1..c595f0d 100644 --- a/contrib/sendmail/libsm/README +++ b/contrib/sendmail/libsm/README @@ -1,11 +1,11 @@ -# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. +# Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set # forth in the LICENSE file which can be found at the top level of # the sendmail distribution. # -# $Id: README,v 1.24 2003/12/20 09:23:48 gshapiro Exp $ +# $Id: README,v 1.25 2013/11/22 20:51:42 ca Exp $ # Libsm is a library of generally useful C abstractions. diff --git a/contrib/sendmail/libsm/assert.c b/contrib/sendmail/libsm/assert.c index 7200a0f..a2e9963 100644 --- a/contrib/sendmail/libsm/assert.c +++ b/contrib/sendmail/libsm/assert.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: assert.c,v 1.26 2003/12/05 22:45:24 ca Exp $") +SM_RCSID("@(#)$Id: assert.c,v 1.27 2013/11/22 20:51:42 ca Exp $") /* ** Abnormal program termination and assertion checking. diff --git a/contrib/sendmail/libsm/b-strcmp.c b/contrib/sendmail/libsm/b-strcmp.c index c7dcb88..f918619 100644 --- a/contrib/sendmail/libsm/b-strcmp.c +++ b/contrib/sendmail/libsm/b-strcmp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2004 Proofpoint, 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: b-strcmp.c,v 1.14 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: b-strcmp.c,v 1.15 2013/11/22 20:51:42 ca Exp $") #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/contrib/sendmail/libsm/b-strl.c b/contrib/sendmail/libsm/b-strl.c index e0bc24e..eb6fb00 100644 --- a/contrib/sendmail/libsm/b-strl.c +++ b/contrib/sendmail/libsm/b-strl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -19,7 +19,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: b-strl.c,v 1.25 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: b-strl.c,v 1.26 2013/11/22 20:51:42 ca Exp $") #include <stdio.h> #include <stdlib.h> #include <unistd.h> diff --git a/contrib/sendmail/libsm/cf.c b/contrib/sendmail/libsm/cf.c index 6501c05..fe1adf4 100644 --- a/contrib/sendmail/libsm/cf.c +++ b/contrib/sendmail/libsm/cf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: cf.c,v 1.7 2013/03/12 15:24:50 ca Exp $") +SM_RCSID("@(#)$Id: cf.c,v 1.8 2013/11/22 20:51:42 ca Exp $") #include <ctype.h> #include <errno.h> diff --git a/contrib/sendmail/libsm/clock.c b/contrib/sendmail/libsm/clock.c index 1bdb4fd..cb53d63 100644 --- a/contrib/sendmail/libsm/clock.c +++ b/contrib/sendmail/libsm/clock.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998-2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 1998-2004 Proofpoint, 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.47 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: clock.c,v 1.48 2013/11/22 20:51:42 ca Exp $") #include <unistd.h> #include <time.h> #include <errno.h> diff --git a/contrib/sendmail/libsm/clrerr.c b/contrib/sendmail/libsm/clrerr.c index 5b1a8a8..9d98b1d 100644 --- a/contrib/sendmail/libsm/clrerr.c +++ b/contrib/sendmail/libsm/clrerr.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: clrerr.c,v 1.13 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: clrerr.c,v 1.14 2013/11/22 20:51:42 ca Exp $") #include <sm/io.h> #include <sm/assert.h> #include "local.h" diff --git a/contrib/sendmail/libsm/config.c b/contrib/sendmail/libsm/config.c index c96a738..231f954 100644 --- a/contrib/sendmail/libsm/config.c +++ b/contrib/sendmail/libsm/config.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2003, 2007 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2003, 2007 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: config.c,v 1.31 2007/03/14 21:21:49 ca Exp $") +SM_RCSID("@(#)$Id: config.c,v 1.32 2013/11/22 20:51:42 ca Exp $") #include <stdlib.h> #include <sm/heap.h> diff --git a/contrib/sendmail/libsm/debug.c b/contrib/sendmail/libsm/debug.c index ea9cd84..2190790 100644 --- a/contrib/sendmail/libsm/debug.c +++ b/contrib/sendmail/libsm/debug.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2001, 2003, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000, 2001, 2003, 2004 Proofpoint, 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: debug.c,v 1.32 2009/09/20 05:38:46 ca Exp $") +SM_RCSID("@(#)$Id: debug.c,v 1.33 2013/11/22 20:51:42 ca Exp $") /* ** libsm debugging and tracing diff --git a/contrib/sendmail/libsm/errstring.c b/contrib/sendmail/libsm/errstring.c index b2999bd..6fc5aeb 100644 --- a/contrib/sendmail/libsm/errstring.c +++ b/contrib/sendmail/libsm/errstring.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, 2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001, 2003 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1988, 1993 @@ -11,7 +11,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: errstring.c,v 1.19 2003/12/10 03:53:05 gshapiro Exp $") +SM_RCSID("@(#)$Id: errstring.c,v 1.20 2013/11/22 20:51:42 ca Exp $") #include <errno.h> #include <stdio.h> /* sys_errlist, on some platforms */ diff --git a/contrib/sendmail/libsm/exc.c b/contrib/sendmail/libsm/exc.c index 0bcf17a..cbb6a62 100644 --- a/contrib/sendmail/libsm/exc.c +++ b/contrib/sendmail/libsm/exc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: exc.c,v 1.49 2006/12/19 19:28:09 ca Exp $") +SM_RCSID("@(#)$Id: exc.c,v 1.50 2013/11/22 20:51:42 ca Exp $") /* ** exception handling diff --git a/contrib/sendmail/libsm/fclose.c b/contrib/sendmail/libsm/fclose.c index 82a7de4..0e6b4ae 100644 --- a/contrib/sendmail/libsm/fclose.c +++ b/contrib/sendmail/libsm/fclose.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2004 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fclose.c,v 1.44 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: fclose.c,v 1.45 2013/11/22 20:51:42 ca Exp $") #include <errno.h> #include <stdlib.h> #include <sm/time.h> diff --git a/contrib/sendmail/libsm/feof.c b/contrib/sendmail/libsm/feof.c index 8d5e0d8..4a98eb3 100644 --- a/contrib/sendmail/libsm/feof.c +++ b/contrib/sendmail/libsm/feof.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: feof.c,v 1.13 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: feof.c,v 1.14 2013/11/22 20:51:42 ca Exp $") #include <sm/io.h> #include <sm/assert.h> #include "local.h" diff --git a/contrib/sendmail/libsm/ferror.c b/contrib/sendmail/libsm/ferror.c index 9487479..3a1d51e 100644 --- a/contrib/sendmail/libsm/ferror.c +++ b/contrib/sendmail/libsm/ferror.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: ferror.c,v 1.13 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: ferror.c,v 1.14 2013/11/22 20:51:42 ca Exp $") #include <sm/io.h> #include <sm/assert.h> #include "local.h" diff --git a/contrib/sendmail/libsm/fflush.c b/contrib/sendmail/libsm/fflush.c index 19159e2..a444d088 100644 --- a/contrib/sendmail/libsm/fflush.c +++ b/contrib/sendmail/libsm/fflush.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2005, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2005, 2006 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fflush.c,v 1.45 2006/03/03 22:25:00 ca Exp $") +SM_RCSID("@(#)$Id: fflush.c,v 1.46 2013/11/22 20:51:42 ca Exp $") #include <unistd.h> #include <errno.h> #include <sm/time.h> diff --git a/contrib/sendmail/libsm/fget.c b/contrib/sendmail/libsm/fget.c index 01c49da..132c524 100644 --- a/contrib/sendmail/libsm/fget.c +++ b/contrib/sendmail/libsm/fget.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2013 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2013 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fget.c,v 1.25 2013/03/12 15:24:50 ca Exp $") +SM_RCSID("@(#)$Id: fget.c,v 1.26 2013/11/22 20:51:42 ca Exp $") #include <stdlib.h> #include <string.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/findfp.c b/contrib/sendmail/libsm/findfp.c index 1658929..24d9d80 100644 --- a/contrib/sendmail/libsm/findfp.c +++ b/contrib/sendmail/libsm/findfp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2006 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: findfp.c,v 1.67 2006/08/28 21:24:46 ca Exp $") +SM_RCSID("@(#)$Id: findfp.c,v 1.68 2013/11/22 20:51:42 ca Exp $") #include <stdlib.h> #include <unistd.h> #include <sys/param.h> diff --git a/contrib/sendmail/libsm/flags.c b/contrib/sendmail/libsm/flags.c index 97c38fa..cca6316 100644 --- a/contrib/sendmail/libsm/flags.c +++ b/contrib/sendmail/libsm/flags.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2004, 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2004, 2006 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: flags.c,v 1.23 2006/12/19 19:44:23 ca Exp $") +SM_RCSID("@(#)$Id: flags.c,v 1.24 2013/11/22 20:51:42 ca Exp $") #include <sys/types.h> #include <sys/file.h> #include <errno.h> diff --git a/contrib/sendmail/libsm/fopen.c b/contrib/sendmail/libsm/fopen.c index f15a15d..ef53efa 100644 --- a/contrib/sendmail/libsm/fopen.c +++ b/contrib/sendmail/libsm/fopen.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2004 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fopen.c,v 1.62 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: fopen.c,v 1.63 2013/11/22 20:51:42 ca Exp $") #include <errno.h> #include <setjmp.h> #include <sm/time.h> diff --git a/contrib/sendmail/libsm/fpos.c b/contrib/sendmail/libsm/fpos.c index 4fe22bf..63f24db 100644 --- a/contrib/sendmail/libsm/fpos.c +++ b/contrib/sendmail/libsm/fpos.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fpos.c,v 1.39 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: fpos.c,v 1.40 2013/11/22 20:51:42 ca Exp $") #include <errno.h> #include <setjmp.h> #include <sm/time.h> diff --git a/contrib/sendmail/libsm/fprintf.c b/contrib/sendmail/libsm/fprintf.c index 7193872..bcb92b2 100644 --- a/contrib/sendmail/libsm/fprintf.c +++ b/contrib/sendmail/libsm/fprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fprintf.c,v 1.17 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fprintf.c,v 1.18 2013/11/22 20:51:42 ca Exp $") #include <sm/varargs.h> #include <sm/io.h> #include <sm/assert.h> diff --git a/contrib/sendmail/libsm/fpurge.c b/contrib/sendmail/libsm/fpurge.c index 4e6fd5a..2d86f2a 100644 --- a/contrib/sendmail/libsm/fpurge.c +++ b/contrib/sendmail/libsm/fpurge.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fpurge.c,v 1.20 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fpurge.c,v 1.21 2013/11/22 20:51:42 ca Exp $") #include <stdlib.h> #include <errno.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/fput.c b/contrib/sendmail/libsm/fput.c index 3c5e11c..7640519 100644 --- a/contrib/sendmail/libsm/fput.c +++ b/contrib/sendmail/libsm/fput.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fput.c,v 1.20 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fput.c,v 1.21 2013/11/22 20:51:42 ca Exp $") #include <string.h> #include <errno.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/fread.c b/contrib/sendmail/libsm/fread.c index 1e651fd..bed66bc 100644 --- a/contrib/sendmail/libsm/fread.c +++ b/contrib/sendmail/libsm/fread.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fread.c,v 1.28 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fread.c,v 1.29 2013/11/22 20:51:42 ca Exp $") #include <string.h> #include <errno.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/fscanf.c b/contrib/sendmail/libsm/fscanf.c index 5e1fcfd..b7dab1e 100644 --- a/contrib/sendmail/libsm/fscanf.c +++ b/contrib/sendmail/libsm/fscanf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fscanf.c,v 1.17 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fscanf.c,v 1.18 2013/11/22 20:51:42 ca Exp $") #include <sm/varargs.h> #include <sm/assert.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/fseek.c b/contrib/sendmail/libsm/fseek.c index 4b3fe10..de58e4e 100644 --- a/contrib/sendmail/libsm/fseek.c +++ b/contrib/sendmail/libsm/fseek.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fseek.c,v 1.47 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: fseek.c,v 1.48 2013/11/22 20:51:42 ca Exp $") #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/contrib/sendmail/libsm/fvwrite.c b/contrib/sendmail/libsm/fvwrite.c index a692781..485f78e 100644 --- a/contrib/sendmail/libsm/fvwrite.c +++ b/contrib/sendmail/libsm/fvwrite.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fvwrite.c,v 1.49 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fvwrite.c,v 1.50 2013/11/22 20:51:42 ca Exp $") #include <stdlib.h> #include <unistd.h> #include <string.h> diff --git a/contrib/sendmail/libsm/fvwrite.h b/contrib/sendmail/libsm/fvwrite.h index a1344c0..11814a3 100644 --- a/contrib/sendmail/libsm/fvwrite.h +++ b/contrib/sendmail/libsm/fvwrite.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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: fvwrite.h,v 1.7 2001/03/02 00:18:19 ca Exp $ + * $Id: fvwrite.h,v 1.8 2013/11/22 20:51:43 ca Exp $ */ /* I/O descriptors for sm_fvwrite() */ diff --git a/contrib/sendmail/libsm/fwalk.c b/contrib/sendmail/libsm/fwalk.c index b878c1a..c647223 100644 --- a/contrib/sendmail/libsm/fwalk.c +++ b/contrib/sendmail/libsm/fwalk.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fwalk.c,v 1.21 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fwalk.c,v 1.22 2013/11/22 20:51:43 ca Exp $") #include <errno.h> #include <sm/io.h> #include "local.h" diff --git a/contrib/sendmail/libsm/fwrite.c b/contrib/sendmail/libsm/fwrite.c index 372f75d..c7d9ad6 100644 --- a/contrib/sendmail/libsm/fwrite.c +++ b/contrib/sendmail/libsm/fwrite.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: fwrite.c,v 1.24 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: fwrite.c,v 1.25 2013/11/22 20:51:43 ca Exp $") #include <errno.h> #include <sm/io.h> #include <sm/assert.h> diff --git a/contrib/sendmail/libsm/get.c b/contrib/sendmail/libsm/get.c index 74549fe..fc58fd1 100644 --- a/contrib/sendmail/libsm/get.c +++ b/contrib/sendmail/libsm/get.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: get.c,v 1.18 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: get.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include <sm/io.h> #include <sm/assert.h> #include "local.h" diff --git a/contrib/sendmail/libsm/glue.h b/contrib/sendmail/libsm/glue.h index db8c101..d616f44 100644 --- a/contrib/sendmail/libsm/glue.h +++ b/contrib/sendmail/libsm/glue.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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: glue.h,v 1.6 2001/01/22 23:09:49 ca Exp $ + * $Id: glue.h,v 1.7 2013/11/22 20:51:43 ca Exp $ */ /* diff --git a/contrib/sendmail/libsm/heap.c b/contrib/sendmail/libsm/heap.c index 8ee4396..974865a 100644 --- a/contrib/sendmail/libsm/heap.c +++ b/contrib/sendmail/libsm/heap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2004 Proofpoint, 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: heap.c,v 1.51 2004/08/03 20:32:00 ca Exp $") +SM_RCSID("@(#)$Id: heap.c,v 1.52 2013/11/22 20:51:43 ca Exp $") /* ** debugging memory allocation package diff --git a/contrib/sendmail/libsm/inet6_ntop.c b/contrib/sendmail/libsm/inet6_ntop.c new file mode 100644 index 0000000..675f79e --- /dev/null +++ b/contrib/sendmail/libsm/inet6_ntop.c @@ -0,0 +1,58 @@ +/* + * Copyright (c) 2013 Proofpoint, Inc. and its suppliers. + * All rights reserved. + * + * By using this file, you agree to the terms and conditions set + * forth in the LICENSE file which can be found at the top level of + * the sendmail distribution. + * + */ + +#include <sm/gen.h> +SM_RCSID("@(#)$Id: inet6_ntop.c,v 1.2 2013/11/22 20:51:43 ca Exp $") + +#if NETINET6 +# include <sm/conf.h> +# include <sm/types.h> +# include <sm/io.h> +# include <sm/string.h> +# include <netinet/in.h> + +/* +** SM_INET6_NTOP -- convert IPv6 address to ASCII string (uncompressed) +** +** Parameters: +** ipv6 -- IPv6 address +** dst -- ASCII representation of address (output) +** len -- length of dst +** +** Returns: +** error: NULL +*/ + +char * +sm_inet6_ntop(ipv6, dst, len) + const void *ipv6; + char *dst; + size_t len; +{ + SM_UINT16 *u16; + int r; + + u16 = (SM_UINT16 *)ipv6; + r = sm_snprintf(dst, len, + "%x:%x:%x:%x:%x:%x:%x:%x" + , htons(u16[0]) + , htons(u16[1]) + , htons(u16[2]) + , htons(u16[3]) + , htons(u16[4]) + , htons(u16[5]) + , htons(u16[6]) + , htons(u16[7]) + ); + if (r > 0) + return dst; + return NULL; +} +#endif /* NETINET6 */ diff --git a/contrib/sendmail/libsm/ldap.c b/contrib/sendmail/libsm/ldap.c index 9ae233f..586149c 100644 --- a/contrib/sendmail/libsm/ldap.c +++ b/contrib/sendmail/libsm/ldap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2009 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001-2009 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -11,7 +11,7 @@ #define LDAP_DEPRECATED 1 #include <sm/gen.h> -SM_RCSID("@(#)$Id: ldap.c,v 1.85 2011/04/18 22:20:20 ca Exp $") +SM_RCSID("@(#)$Id: ldap.c,v 1.86 2013/11/22 20:51:43 ca Exp $") #if LDAPMAP # include <sys/types.h> diff --git a/contrib/sendmail/libsm/local.h b/contrib/sendmail/libsm/local.h index b0625a5..9ce4122 100644 --- a/contrib/sendmail/libsm/local.h +++ b/contrib/sendmail/libsm/local.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002, 2004-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2004-2006 Proofpoint, 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.58 2006/12/19 19:44:23 ca Exp $ + * $Id: local.h,v 1.59 2013/11/22 20:51:43 ca Exp $ */ /* diff --git a/contrib/sendmail/libsm/makebuf.c b/contrib/sendmail/libsm/makebuf.c index 044de8c..dc778a0 100644 --- a/contrib/sendmail/libsm/makebuf.c +++ b/contrib/sendmail/libsm/makebuf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: makebuf.c,v 1.26 2001/10/31 16:04:08 ca Exp $") +SM_RCSID("@(#)$Id: makebuf.c,v 1.27 2013/11/22 20:51:43 ca Exp $") #include <stdlib.h> #include <unistd.h> #include <sys/types.h> diff --git a/contrib/sendmail/libsm/match.c b/contrib/sendmail/libsm/match.c index e42b865a3..6aeb2ef 100644 --- a/contrib/sendmail/libsm/match.c +++ b/contrib/sendmail/libsm/match.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: match.c,v 1.10 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: match.c,v 1.11 2013/11/22 20:51:43 ca Exp $") #include <sm/string.h> diff --git a/contrib/sendmail/libsm/mbdb.c b/contrib/sendmail/libsm/mbdb.c index 3bb514d..482ed70 100644 --- a/contrib/sendmail/libsm/mbdb.c +++ b/contrib/sendmail/libsm/mbdb.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2003,2009 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001-2003,2009 Proofpoint, 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: mbdb.c,v 1.41 2009/06/19 22:02:26 guenther Exp $") +SM_RCSID("@(#)$Id: mbdb.c,v 1.43 2014/01/08 17:03:15 ca Exp $") #include <sys/param.h> @@ -332,23 +332,16 @@ mbdb_pw_lookup(name, user) pw = getpwnam(name); if (pw == NULL) { -#if 0 +#if _FFR_USE_GETPWNAM_ERRNO /* - ** getpwnam() isn't advertised as setting errno. - ** In fact, under FreeBSD, non-root getpwnam() on - ** non-existant users returns NULL with errno = EPERM. - ** This test won't work. + ** Only enable this code iff + ** user unknown <-> getpwnam() == NULL && errno == 0 + ** (i.e., errno unchanged); see the POSIX spec. */ - switch (errno) - { - case 0: - return EX_NOUSER; - case EIO: - return EX_OSERR; - default: + + if (errno != 0) return EX_TEMPFAIL; - } -#endif /* 0 */ +#endif /* _FFR_USE_GETPWNAM_ERRNO */ return EX_NOUSER; } diff --git a/contrib/sendmail/libsm/memstat.c b/contrib/sendmail/libsm/memstat.c index 80391d7..b8fe048 100644 --- a/contrib/sendmail/libsm/memstat.c +++ b/contrib/sendmail/libsm/memstat.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2007 Sendmail, Inc. and its suppliers. + * Copyright (c) 2005-2007 Proofpoint, 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: memstat.c,v 1.6 2007/03/20 23:26:12 ca Exp $") +SM_RCSID("@(#)$Id: memstat.c,v 1.7 2013/11/22 20:51:43 ca Exp $") #include <errno.h> #include <sm/misc.h> diff --git a/contrib/sendmail/libsm/mpeix.c b/contrib/sendmail/libsm/mpeix.c index 163dfba..f997e81 100644 --- a/contrib/sendmail/libsm/mpeix.c +++ b/contrib/sendmail/libsm/mpeix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001-2002 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: mpeix.c,v 1.7 2007/05/11 18:51:22 gshapiro Exp $") +SM_RCSID("@(#)$Id: mpeix.c,v 1.8 2013/11/22 20:51:43 ca Exp $") #ifdef MPE /* diff --git a/contrib/sendmail/libsm/niprop.c b/contrib/sendmail/libsm/niprop.c index ad58867..41465cf 100644 --- a/contrib/sendmail/libsm/niprop.c +++ b/contrib/sendmail/libsm/niprop.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001 Proofpoint, 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: niprop.c,v 1.8 2001/09/11 04:04:48 gshapiro Exp $") +SM_RCSID("@(#)$Id: niprop.c,v 1.9 2013/11/22 20:51:43 ca Exp $") #if NETINFO #include <ctype.h> diff --git a/contrib/sendmail/libsm/path.c b/contrib/sendmail/libsm/path.c index 6932e1f..0e33972 100644 --- a/contrib/sendmail/libsm/path.c +++ b/contrib/sendmail/libsm/path.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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: path.c,v 1.9 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: path.c,v 1.10 2013/11/22 20:51:43 ca Exp $") #include <sm/path.h> #include <sm/string.h> diff --git a/contrib/sendmail/libsm/put.c b/contrib/sendmail/libsm/put.c index d513b98..05de94a 100644 --- a/contrib/sendmail/libsm/put.c +++ b/contrib/sendmail/libsm/put.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: put.c,v 1.27 2001/12/19 05:19:35 ca Exp $") +SM_RCSID("@(#)$Id: put.c,v 1.28 2013/11/22 20:51:43 ca Exp $") #include <string.h> #include <errno.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/refill.c b/contrib/sendmail/libsm/refill.c index eae6ab4..43c76f9 100644 --- a/contrib/sendmail/libsm/refill.c +++ b/contrib/sendmail/libsm/refill.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2005-2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2005-2006 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: refill.c,v 1.53 2006/02/28 18:48:25 ca Exp $") +SM_RCSID("@(#)$Id: refill.c,v 1.54 2013/11/22 20:51:43 ca Exp $") #include <stdlib.h> #include <unistd.h> #include <errno.h> diff --git a/contrib/sendmail/libsm/rewind.c b/contrib/sendmail/libsm/rewind.c index 597c6db..9b079b1 100644 --- a/contrib/sendmail/libsm/rewind.c +++ b/contrib/sendmail/libsm/rewind.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: rewind.c,v 1.18 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: rewind.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include <errno.h> #include <sm/io.h> #include <sm/assert.h> diff --git a/contrib/sendmail/libsm/rpool.c b/contrib/sendmail/libsm/rpool.c index 39344c2..4c7598e 100644 --- a/contrib/sendmail/libsm/rpool.c +++ b/contrib/sendmail/libsm/rpool.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2004 Proofpoint, 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: rpool.c,v 1.28 2004/08/03 20:44:04 ca Exp $") +SM_RCSID("@(#)$Id: rpool.c,v 1.29 2013/11/22 20:51:43 ca Exp $") /* ** resource pools diff --git a/contrib/sendmail/libsm/sem.c b/contrib/sendmail/libsm/sem.c index 83a54e3..06723c8 100644 --- a/contrib/sendmail/libsm/sem.c +++ b/contrib/sendmail/libsm/sem.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2005, 2008 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2005, 2008 Proofpoint, 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: sem.c,v 1.14 2008/05/30 16:26:38 ca Exp $") +SM_RCSID("@(#)$Id: sem.c,v 1.15 2013/11/22 20:51:43 ca Exp $") #if SM_CONF_SEM # include <stdlib.h> diff --git a/contrib/sendmail/libsm/setvbuf.c b/contrib/sendmail/libsm/setvbuf.c index 172a767..0d8bee9 100644 --- a/contrib/sendmail/libsm/setvbuf.c +++ b/contrib/sendmail/libsm/setvbuf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: setvbuf.c,v 1.32 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: setvbuf.c,v 1.33 2013/11/22 20:51:43 ca Exp $") #include <stdlib.h> #include <errno.h> #include <fcntl.h> diff --git a/contrib/sendmail/libsm/shm.c b/contrib/sendmail/libsm/shm.c index 15c1119..c4045be 100644 --- a/contrib/sendmail/libsm/shm.c +++ b/contrib/sendmail/libsm/shm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2003, 2005 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2003, 2005 Proofpoint, 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: shm.c,v 1.19 2005/07/14 22:34:28 ca Exp $") +SM_RCSID("@(#)$Id: shm.c,v 1.20 2013/11/22 20:51:43 ca Exp $") #if SM_CONF_SHM # include <stdlib.h> diff --git a/contrib/sendmail/libsm/signal.c b/contrib/sendmail/libsm/signal.c index ce2e242..b8d6a34 100644 --- a/contrib/sendmail/libsm/signal.c +++ b/contrib/sendmail/libsm/signal.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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: signal.c,v 1.17 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: signal.c,v 1.18 2013/11/22 20:51:43 ca Exp $") #if SM_CONF_SETITIMER # include <sm/time.h> diff --git a/contrib/sendmail/libsm/smstdio.c b/contrib/sendmail/libsm/smstdio.c index 27552e5..711609d 100644 --- a/contrib/sendmail/libsm/smstdio.c +++ b/contrib/sendmail/libsm/smstdio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2004 Proofpoint, 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_IDSTR(id, "@(#)$Id: smstdio.c,v 1.34 2004/08/03 20:46:34 ca Exp $") +SM_IDSTR(id, "@(#)$Id: smstdio.c,v 1.35 2013/11/22 20:51:43 ca Exp $") #include <unistd.h> #include <stdio.h> #include <fcntl.h> diff --git a/contrib/sendmail/libsm/snprintf.c b/contrib/sendmail/libsm/snprintf.c index cdb7688..ee12d97 100644 --- a/contrib/sendmail/libsm/snprintf.c +++ b/contrib/sendmail/libsm/snprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: snprintf.c,v 1.24 2006/10/12 21:50:10 ca Exp $") +SM_RCSID("@(#)$Id: snprintf.c,v 1.25 2013/11/22 20:51:43 ca Exp $") #include <limits.h> #include <sm/varargs.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/sscanf.c b/contrib/sendmail/libsm/sscanf.c index 168bcfd..2515d55 100644 --- a/contrib/sendmail/libsm/sscanf.c +++ b/contrib/sendmail/libsm/sscanf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: sscanf.c,v 1.25 2002/02/01 02:28:00 ca Exp $") +SM_RCSID("@(#)$Id: sscanf.c,v 1.26 2013/11/22 20:51:43 ca Exp $") #include <string.h> #include <sm/varargs.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/stdio.c b/contrib/sendmail/libsm/stdio.c index 5fe8f22..974b242 100644 --- a/contrib/sendmail/libsm/stdio.c +++ b/contrib/sendmail/libsm/stdio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2005 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2005 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: stdio.c,v 1.71 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: stdio.c,v 1.72 2013/11/22 20:51:43 ca Exp $") #include <unistd.h> #include <errno.h> #include <fcntl.h> diff --git a/contrib/sendmail/libsm/strcasecmp.c b/contrib/sendmail/libsm/strcasecmp.c index 15f5ce8..3f1c218 100644 --- a/contrib/sendmail/libsm/strcasecmp.c +++ b/contrib/sendmail/libsm/strcasecmp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1983, 1995-1997 Eric P. Allman. All rights reserved. * Copyright (c) 1987, 1988, 1993 @@ -12,7 +12,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: strcasecmp.c,v 1.15 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: strcasecmp.c,v 1.16 2013/11/22 20:51:43 ca Exp $") #include <sm/config.h> #include <sm/string.h> diff --git a/contrib/sendmail/libsm/strdup.c b/contrib/sendmail/libsm/strdup.c index 7094275..e7de037 100644 --- a/contrib/sendmail/libsm/strdup.c +++ b/contrib/sendmail/libsm/strdup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2003 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: strdup.c,v 1.15 2003/10/10 17:56:57 ca Exp $") +SM_RCSID("@(#)$Id: strdup.c,v 1.16 2013/11/22 20:51:43 ca Exp $") #include <sm/heap.h> #include <sm/string.h> diff --git a/contrib/sendmail/libsm/strerror.c b/contrib/sendmail/libsm/strerror.c index ffdfb21..4b9e15f 100644 --- a/contrib/sendmail/libsm/strerror.c +++ b/contrib/sendmail/libsm/strerror.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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: strerror.c,v 1.23 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: strerror.c,v 1.24 2013/11/22 20:51:43 ca Exp $") /* ** define strerror for platforms that lack it. diff --git a/contrib/sendmail/libsm/strexit.c b/contrib/sendmail/libsm/strexit.c index 0f2cdfc..74bac56 100644 --- a/contrib/sendmail/libsm/strexit.c +++ b/contrib/sendmail/libsm/strexit.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001 Proofpoint, 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: strexit.c,v 1.5 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: strexit.c,v 1.6 2013/11/22 20:51:43 ca Exp $") #include <sm/string.h> #include <sm/sysexits.h> diff --git a/contrib/sendmail/libsm/string.c b/contrib/sendmail/libsm/string.c index b0b6975..fe53d21 100644 --- a/contrib/sendmail/libsm/string.c +++ b/contrib/sendmail/libsm/string.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: string.c,v 1.3 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: string.c,v 1.4 2013/11/22 20:51:43 ca Exp $") #include <ctype.h> #include <errno.h> diff --git a/contrib/sendmail/libsm/stringf.c b/contrib/sendmail/libsm/stringf.c index b6a7f66..fa9814b 100644 --- a/contrib/sendmail/libsm/stringf.c +++ b/contrib/sendmail/libsm/stringf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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: stringf.c,v 1.15 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: stringf.c,v 1.16 2013/11/22 20:51:43 ca Exp $") #include <errno.h> #include <stdio.h> #include <sm/exc.h> diff --git a/contrib/sendmail/libsm/strio.c b/contrib/sendmail/libsm/strio.c index 75f3764..4775858 100644 --- a/contrib/sendmail/libsm/strio.c +++ b/contrib/sendmail/libsm/strio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002, 2004, 2005 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2004, 2005 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_IDSTR(id, "@(#)$Id: strio.c,v 1.44 2005/06/09 21:40:19 ca Exp $") +SM_IDSTR(id, "@(#)$Id: strio.c,v 1.45 2013/11/22 20:51:43 ca Exp $") #include <stdlib.h> #include <unistd.h> #include <fcntl.h> diff --git a/contrib/sendmail/libsm/strl.c b/contrib/sendmail/libsm/strl.c index ec9a81b..bcf2382 100644 --- a/contrib/sendmail/libsm/strl.c +++ b/contrib/sendmail/libsm/strl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 1999-2002 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: strl.c,v 1.31 2002/01/20 01:41:25 gshapiro Exp $") +SM_RCSID("@(#)$Id: strl.c,v 1.32 2013/11/22 20:51:43 ca Exp $") #include <sm/config.h> #include <sm/string.h> diff --git a/contrib/sendmail/libsm/strrevcmp.c b/contrib/sendmail/libsm/strrevcmp.c index d0ed630..9403c89 100644 --- a/contrib/sendmail/libsm/strrevcmp.c +++ b/contrib/sendmail/libsm/strrevcmp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: strrevcmp.c,v 1.5 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: strrevcmp.c,v 1.6 2013/11/22 20:51:43 ca Exp $") #include <sm/config.h> #include <sm/string.h> diff --git a/contrib/sendmail/libsm/strto.c b/contrib/sendmail/libsm/strto.c index 87e84bf..a264cba 100644 --- a/contrib/sendmail/libsm/strto.c +++ b/contrib/sendmail/libsm/strto.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1992 * The Regents of the University of California. All rights reserved. @@ -10,7 +10,7 @@ */ #include <sm/gen.h> -SM_IDSTR(id, "@(#)$Id: strto.c,v 1.18 2001/12/30 04:59:37 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: strto.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include <sys/param.h> #include <sys/types.h> diff --git a/contrib/sendmail/libsm/syslogio.c b/contrib/sendmail/libsm/syslogio.c index 24fa3a2..0213024 100644 --- a/contrib/sendmail/libsm/syslogio.c +++ b/contrib/sendmail/libsm/syslogio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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: syslogio.c,v 1.29 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: syslogio.c,v 1.30 2013/11/22 20:51:43 ca Exp $") #include <stdlib.h> #include <unistd.h> #include <fcntl.h> diff --git a/contrib/sendmail/libsm/t-cf.c b/contrib/sendmail/libsm/t-cf.c index 9078514..7fa89f9 100644 --- a/contrib/sendmail/libsm/t-cf.c +++ b/contrib/sendmail/libsm/t-cf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_IDSTR(id, "@(#)$Id: t-cf.c,v 1.7 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-cf.c,v 1.8 2013/11/22 20:51:43 ca Exp $") #include <errno.h> #include <stdio.h> diff --git a/contrib/sendmail/libsm/t-event.c b/contrib/sendmail/libsm/t-event.c index 1096b36..611599e 100644 --- a/contrib/sendmail/libsm/t-event.c +++ b/contrib/sendmail/libsm/t-event.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001-2002, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001-2002, 2004 Proofpoint, 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: t-event.c,v 1.13 2005/06/14 23:07:20 ca Exp $") +SM_RCSID("@(#)$Id: t-event.c,v 1.14 2013/11/22 20:51:43 ca Exp $") #include <stdio.h> diff --git a/contrib/sendmail/libsm/t-exc.c b/contrib/sendmail/libsm/t-exc.c index a6922e0..9455703 100644 --- a/contrib/sendmail/libsm/t-exc.c +++ b/contrib/sendmail/libsm/t-exc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-exc.c,v 1.20 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-exc.c,v 1.21 2013/11/22 20:51:43 ca Exp $") #include <string.h> #include <sm/heap.h> diff --git a/contrib/sendmail/libsm/t-fget.c b/contrib/sendmail/libsm/t-fget.c index 434debf..ab2145c 100644 --- a/contrib/sendmail/libsm/t-fget.c +++ b/contrib/sendmail/libsm/t-fget.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013 Sendmail, Inc. and its suppliers. + * Copyright (c) 2013 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-fget.c,v 1.1 2013/03/12 15:24:50 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-fget.c,v 1.2 2013/11/22 20:51:43 ca Exp $") #include <sm/io.h> #include <sm/string.h> diff --git a/contrib/sendmail/libsm/t-float.c b/contrib/sendmail/libsm/t-float.c index f3f059b..93f7434 100644 --- a/contrib/sendmail/libsm/t-float.c +++ b/contrib/sendmail/libsm/t-float.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-float.c,v 1.18 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-float.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include <sm/limits.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/t-fopen.c b/contrib/sendmail/libsm/t-fopen.c index 2d3839a..143bb94 100644 --- a/contrib/sendmail/libsm/t-fopen.c +++ b/contrib/sendmail/libsm/t-fopen.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-fopen.c,v 1.9 2002/02/06 23:57:45 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-fopen.c,v 1.10 2013/11/22 20:51:43 ca Exp $") #include <fcntl.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/t-heap.c b/contrib/sendmail/libsm/t-heap.c index 7ddb60d..6052823 100644 --- a/contrib/sendmail/libsm/t-heap.c +++ b/contrib/sendmail/libsm/t-heap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-heap.c,v 1.10 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-heap.c,v 1.11 2013/11/22 20:51:43 ca Exp $") #include <sm/debug.h> #include <sm/heap.h> diff --git a/contrib/sendmail/libsm/t-inet6_ntop.c b/contrib/sendmail/libsm/t-inet6_ntop.c new file mode 100644 index 0000000..525bbec --- /dev/null +++ b/contrib/sendmail/libsm/t-inet6_ntop.c @@ -0,0 +1,73 @@ +/* + * Copyright (c) 2013 Proofpoint, Inc. and its suppliers. + * All rights reserved. + * + * By using this file, you agree to the terms and conditions set + * forth in the LICENSE file which can be found at the top level of + * the sendmail distribution. + */ + +#include <sm/gen.h> +SM_IDSTR(id, "@(#)$Id: t-inet6_ntop.c,v 1.2 2013/11/22 20:51:43 ca Exp $") + +#include <sm/conf.h> +#if NETINET6 +#include <sm/io.h> +#include <sm/test.h> +#include <sm/string.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> + +static char *ipv6f[] = { + "1234:5678:9abc:def0:fedc:dead:f00f:101", + "1080:0:0:0:8:800:200c:417a", + "ff01:0:0:0:0:0:0:43", + "0:0:0:0:0:0:0:1", + "1:0:0:0:0:0:0:1", + "0:1:0:0:0:0:0:1", + "0:0:1:0:0:0:0:1", + "0:0:0:1:0:0:0:1", + "0:0:0:0:1:0:0:1", + "0:0:0:0:0:1:0:1", + "0:0:0:0:0:0:1:1", + "1:a:b:c:d:e:f:9", + "0:0:0:0:0:0:0:0", + NULL +}; + +static void +test() +{ + int i, r; + struct sockaddr_in6 addr; + char *ip, *ipf, ipv6str[INET6_ADDRSTRLEN]; + + for (i = 0; (ip = ipv6f[i]) != NULL; i++) { + r = inet_pton(AF_INET6, ip, &addr.sin6_addr); + SM_TEST(r == 1); + ipf = sm_inet6_ntop(&addr.sin6_addr, ipv6str, sizeof(ipv6str)); + SM_TEST(ipf != NULL); + SM_TEST(strcmp(ipf, ip) == 0); + } +} + +int +main(argc, argv) + int argc; + char **argv; +{ + sm_test_begin(argc, argv, "test inet6_ntop"); + test(); + return sm_test_end(); +} +#else /* NETINET6 */ + +int +main(argc, argv) + int argc; + char **argv; +{ + return 0; +} +#endif /* NETINET6 */ diff --git a/contrib/sendmail/libsm/t-match.c b/contrib/sendmail/libsm/t-match.c index d2776c0..ec07239 100644 --- a/contrib/sendmail/libsm/t-match.c +++ b/contrib/sendmail/libsm/t-match.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-match.c,v 1.9 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-match.c,v 1.10 2013/11/22 20:51:43 ca Exp $") #include <sm/string.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/t-memstat.c b/contrib/sendmail/libsm/t-memstat.c index 3bfe394..a4622b6 100644 --- a/contrib/sendmail/libsm/t-memstat.c +++ b/contrib/sendmail/libsm/t-memstat.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005-2007 Sendmail, Inc. and its suppliers. + * Copyright (c) 2005-2007 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-memstat.c,v 1.9 2007/03/14 21:41:09 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-memstat.c,v 1.11 2013/11/22 20:51:43 ca Exp $") #include <sm/misc.h> @@ -63,6 +63,12 @@ main(argc, argv) case 'r': resource = strdup(optarg); + if (resource == NULL) + { + fprintf(stderr, "strdup(%s) failed\n", + optarg); + exit(1); + } break; case 's': diff --git a/contrib/sendmail/libsm/t-path.c b/contrib/sendmail/libsm/t-path.c index fa6e345..1387fc6 100644 --- a/contrib/sendmail/libsm/t-path.c +++ b/contrib/sendmail/libsm/t-path.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-path.c,v 1.8 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-path.c,v 1.9 2013/11/22 20:51:43 ca Exp $") #include <string.h> #include <sm/path.h> diff --git a/contrib/sendmail/libsm/t-qic.c b/contrib/sendmail/libsm/t-qic.c index 8a8e0c8..0e62dd4 100644 --- a/contrib/sendmail/libsm/t-qic.c +++ b/contrib/sendmail/libsm/t-qic.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2006 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-qic.c,v 1.9 2006/08/24 21:26:13 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-qic.c,v 1.10 2013/11/22 20:51:43 ca Exp $") #include <stdio.h> #include <sm/sendmail.h> diff --git a/contrib/sendmail/libsm/t-rpool.c b/contrib/sendmail/libsm/t-rpool.c index b671a4b..6408c1b 100644 --- a/contrib/sendmail/libsm/t-rpool.c +++ b/contrib/sendmail/libsm/t-rpool.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-rpool.c,v 1.18 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-rpool.c,v 1.19 2013/11/22 20:51:43 ca Exp $") #include <sm/debug.h> #include <sm/heap.h> diff --git a/contrib/sendmail/libsm/t-scanf.c b/contrib/sendmail/libsm/t-scanf.c index b3ca0bd..e7e9807 100644 --- a/contrib/sendmail/libsm/t-scanf.c +++ b/contrib/sendmail/libsm/t-scanf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-scanf.c,v 1.5 2001/11/13 00:51:28 ca Exp $") +SM_IDSTR(id, "@(#)$Id: t-scanf.c,v 1.6 2013/11/22 20:51:43 ca Exp $") #include <sm/limits.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/t-sem.c b/contrib/sendmail/libsm/t-sem.c index 662b4f6..017ba7c 100644 --- a/contrib/sendmail/libsm/t-sem.c +++ b/contrib/sendmail/libsm/t-sem.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2005-2008 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2005-2008 Proofpoint, 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: t-sem.c,v 1.17 2008/05/30 16:26:38 ca Exp $") +SM_RCSID("@(#)$Id: t-sem.c,v 1.18 2013/11/22 20:51:43 ca Exp $") #include <stdio.h> diff --git a/contrib/sendmail/libsm/t-shm.c b/contrib/sendmail/libsm/t-shm.c index ba0bc6c..5a81f22 100644 --- a/contrib/sendmail/libsm/t-shm.c +++ b/contrib/sendmail/libsm/t-shm.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002, 2004, 2005 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002, 2004, 2005 Proofpoint, 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: t-shm.c,v 1.22 2005/01/14 02:14:10 ca Exp $") +SM_RCSID("@(#)$Id: t-shm.c,v 1.23 2013/11/22 20:51:43 ca Exp $") #include <stdio.h> diff --git a/contrib/sendmail/libsm/t-smstdio.c b/contrib/sendmail/libsm/t-smstdio.c index 3bad1c1..32d770b 100644 --- a/contrib/sendmail/libsm/t-smstdio.c +++ b/contrib/sendmail/libsm/t-smstdio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-smstdio.c,v 1.11 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-smstdio.c,v 1.12 2013/11/22 20:51:43 ca Exp $") #include <sm/io.h> #include <sm/string.h> diff --git a/contrib/sendmail/libsm/t-string.c b/contrib/sendmail/libsm/t-string.c index 0506e7a..03e5ca8 100644 --- a/contrib/sendmail/libsm/t-string.c +++ b/contrib/sendmail/libsm/t-string.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-string.c,v 1.11 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-string.c,v 1.12 2013/11/22 20:51:43 ca Exp $") #include <sm/exc.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/t-strio.c b/contrib/sendmail/libsm/t-strio.c index bb18dae..17cfc7b 100644 --- a/contrib/sendmail/libsm/t-strio.c +++ b/contrib/sendmail/libsm/t-strio.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-strio.c,v 1.11 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-strio.c,v 1.12 2013/11/22 20:51:44 ca Exp $") #include <sm/string.h> #include <sm/io.h> #include <sm/test.h> diff --git a/contrib/sendmail/libsm/t-strl.c b/contrib/sendmail/libsm/t-strl.c index 5c118dc..24dc8df 100644 --- a/contrib/sendmail/libsm/t-strl.c +++ b/contrib/sendmail/libsm/t-strl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -9,7 +9,7 @@ */ #include <sm/gen.h> -SM_IDSTR(id, "@(#)$Id: t-strl.c,v 1.15 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-strl.c,v 1.16 2013/11/22 20:51:44 ca Exp $") #include <stdlib.h> #include <stdio.h> diff --git a/contrib/sendmail/libsm/t-strrevcmp.c b/contrib/sendmail/libsm/t-strrevcmp.c index fb8fb46..a4031be 100644 --- a/contrib/sendmail/libsm/t-strrevcmp.c +++ b/contrib/sendmail/libsm/t-strrevcmp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2001 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-strrevcmp.c,v 1.3 2001/09/11 04:04:49 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-strrevcmp.c,v 1.4 2013/11/22 20:51:44 ca Exp $") #include <sm/exc.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/t-types.c b/contrib/sendmail/libsm/t-types.c index cb07f67..aed1e93 100644 --- a/contrib/sendmail/libsm/t-types.c +++ b/contrib/sendmail/libsm/t-types.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002 Proofpoint, 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_IDSTR(id, "@(#)$Id: t-types.c,v 1.18 2002/03/13 17:29:53 gshapiro Exp $") +SM_IDSTR(id, "@(#)$Id: t-types.c,v 1.19 2013/11/22 20:51:44 ca Exp $") #include <sm/limits.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/test.c b/contrib/sendmail/libsm/test.c index 361cc45..117e89b 100644 --- a/contrib/sendmail/libsm/test.c +++ b/contrib/sendmail/libsm/test.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002 Proofpoint, 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_IDSTR(Id, "@(#)$Id: test.c,v 1.16 2002/01/08 17:54:40 ca Exp $") +SM_IDSTR(Id, "@(#)$Id: test.c,v 1.17 2013/11/22 20:51:44 ca Exp $") /* ** Abstractions for writing libsm test programs. diff --git a/contrib/sendmail/libsm/ungetc.c b/contrib/sendmail/libsm/ungetc.c index 2f90e14..36d62e6 100644 --- a/contrib/sendmail/libsm/ungetc.c +++ b/contrib/sendmail/libsm/ungetc.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_IDSTR(id, "@(#)$Id: ungetc.c,v 1.30 2005/06/14 23:07:20 ca Exp $") +SM_IDSTR(id, "@(#)$Id: ungetc.c,v 1.31 2013/11/22 20:51:44 ca Exp $") #include <stdlib.h> #include <string.h> diff --git a/contrib/sendmail/libsm/util.c b/contrib/sendmail/libsm/util.c index 2b99a49..7a600ae 100644 --- a/contrib/sendmail/libsm/util.c +++ b/contrib/sendmail/libsm/util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006 Sendmail, Inc. and its suppliers. + * Copyright (c) 2006 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ #include <sm/gen.h> -SM_RCSID("@(#)$Id: util.c,v 1.9 2006/08/30 18:35:51 ca Exp $") +SM_RCSID("@(#)$Id: util.c,v 1.10 2013/11/22 20:51:44 ca Exp $") #include <sm/setjmp.h> #include <sm/conf.h> #include <sm/assert.h> diff --git a/contrib/sendmail/libsm/vasprintf.c b/contrib/sendmail/libsm/vasprintf.c index 69d8576..7507656 100644 --- a/contrib/sendmail/libsm/vasprintf.c +++ b/contrib/sendmail/libsm/vasprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * * By using this file, you agree to the terms and conditions set @@ -24,7 +24,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: vasprintf.c,v 1.27 2003/06/03 02:14:24 ca Exp $") +SM_RCSID("@(#)$Id: vasprintf.c,v 1.28 2013/11/22 20:51:44 ca Exp $") #include <stdlib.h> #include <errno.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/vfprintf.c b/contrib/sendmail/libsm/vfprintf.c index c4ca9bb..fcc18a1 100644 --- a/contrib/sendmail/libsm/vfprintf.c +++ b/contrib/sendmail/libsm/vfprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_IDSTR(id, "@(#)$Id: vfprintf.c,v 1.54 2005/05/16 03:52:00 ca Exp $") +SM_IDSTR(id, "@(#)$Id: vfprintf.c,v 1.55 2013/11/22 20:51:44 ca Exp $") /* ** Overall: diff --git a/contrib/sendmail/libsm/vfscanf.c b/contrib/sendmail/libsm/vfscanf.c index 8701ef7..a2b871a 100644 --- a/contrib/sendmail/libsm/vfscanf.c +++ b/contrib/sendmail/libsm/vfscanf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001, 2004 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001, 2004 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_IDSTR(id, "@(#)$Id: vfscanf.c,v 1.54 2006/10/12 22:03:52 ca Exp $") +SM_IDSTR(id, "@(#)$Id: vfscanf.c,v 1.55 2013/11/22 20:51:44 ca Exp $") #include <ctype.h> #include <stdlib.h> diff --git a/contrib/sendmail/libsm/vprintf.c b/contrib/sendmail/libsm/vprintf.c index 6e310ef..4061a66 100644 --- a/contrib/sendmail/libsm/vprintf.c +++ b/contrib/sendmail/libsm/vprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: vprintf.c,v 1.14 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: vprintf.c,v 1.15 2013/11/22 20:51:44 ca Exp $") #include <sm/io.h> #include "local.h" diff --git a/contrib/sendmail/libsm/vsnprintf.c b/contrib/sendmail/libsm/vsnprintf.c index 18a4635..15abcba 100644 --- a/contrib/sendmail/libsm/vsnprintf.c +++ b/contrib/sendmail/libsm/vsnprintf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: vsnprintf.c,v 1.23 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: vsnprintf.c,v 1.24 2013/11/22 20:51:44 ca Exp $") #include <limits.h> #include <sm/io.h> #include "local.h" diff --git a/contrib/sendmail/libsm/wbuf.c b/contrib/sendmail/libsm/wbuf.c index 8385535..b52e97e 100644 --- a/contrib/sendmail/libsm/wbuf.c +++ b/contrib/sendmail/libsm/wbuf.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2001 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: wbuf.c,v 1.21 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: wbuf.c,v 1.22 2013/11/22 20:51:44 ca Exp $") #include <errno.h> #include <sm/io.h> #include "local.h" diff --git a/contrib/sendmail/libsm/wsetup.c b/contrib/sendmail/libsm/wsetup.c index 400553e..1d8b48f 100644 --- a/contrib/sendmail/libsm/wsetup.c +++ b/contrib/sendmail/libsm/wsetup.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000-2002 Proofpoint, Inc. and its suppliers. * All rights reserved. * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -13,7 +13,7 @@ */ #include <sm/gen.h> -SM_RCSID("@(#)$Id: wsetup.c,v 1.20 2002/02/07 18:02:45 ca Exp $") +SM_RCSID("@(#)$Id: wsetup.c,v 1.21 2013/11/22 20:51:44 ca Exp $") #include <stdlib.h> #include <errno.h> #include <sm/io.h> diff --git a/contrib/sendmail/libsm/xtrap.c b/contrib/sendmail/libsm/xtrap.c index 7495e09..c25450b 100644 --- a/contrib/sendmail/libsm/xtrap.c +++ b/contrib/sendmail/libsm/xtrap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Sendmail, Inc. and its suppliers. + * Copyright (c) 2000 Proofpoint, 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: xtrap.c,v 1.5 2001/09/11 04:04:49 gshapiro Exp $") +SM_RCSID("@(#)$Id: xtrap.c,v 1.6 2013/11/22 20:51:44 ca Exp $") #include <sm/xtrap.h> |
