Import sendmail 8.13.1

3 files changed, 20 insertions, 14 deletions

diff --git a/contrib/sendmail/makemap/Makefile.m4 b/contrib/sendmail/makemap/Makefile.m4
index 2396311..a4664cf 100644
--- a/contrib/sendmail/makemap/Makefile.m4
+++ b/contrib/sendmail/makemap/Makefile.m4
@@ -1,4 +1,4 @@
-dnl $Id: Makefile.m4,v 8.42.4.1 2002/06/21 21:58:38 ca Exp $
+dnl $Id: Makefile.m4,v 8.43 2002/06/21 22:01:44 ca Exp $
 include(confBUILDTOOLSDIR`/M4/switch.m4')
 
 define(`confREQUIRE_LIBSM', `true')
diff --git a/contrib/sendmail/makemap/makemap.8 b/contrib/sendmail/makemap/makemap.8
index 9faaef7..96338e7 100644
--- a/contrib/sendmail/makemap/makemap.8
+++ b/contrib/sendmail/makemap/makemap.8
@@ -1,4 +1,4 @@
-.\" Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+.\" Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
 .\"	 All rights reserved.
 .\" Copyright (c) 1988, 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -8,9 +8,9 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"     $Id: makemap.8,v 8.29 2001/10/10 03:23:02 ca Exp $
+.\"     $Id: makemap.8,v 8.30 2002/06/27 23:41:04 gshapiro Exp $
 .\"
-.TH MAKEMAP 8 "$Date: 2001/10/10 03:23:02 $"
+.TH MAKEMAP 8 "$Date: 2002/06/27 23:41:04 $"
 .SH NAME
 makemap
 \- create database maps for sendmail
@@ -22,6 +22,8 @@ makemap
 .RB [ \-c
 .IR cachesize ]
 .RB [ \-d ]
+.RB [ \-D
+.IR commentchar ]
 .RB [ \-e ]
 .RB [ \-f ]
 .RB [ \-l ]
@@ -111,6 +113,10 @@ This must match the \-N flag in the sendmail.cf
 .B \-c
 Use the specified hash and B-Tree cache size.
 .TP
+.B \-D
+Use to specify the character to use to indicate a comment (which is ignored)
+instead of the default of '#'.
+.TP
 .B \-d
 Allow duplicate keys in the map.  
 This is only allowed on B-Tree format maps.  
diff --git a/contrib/sendmail/makemap/makemap.c b/contrib/sendmail/makemap/makemap.c
index 59c28f6..bf3d282 100644
--- a/contrib/sendmail/makemap/makemap.c
+++ b/contrib/sendmail/makemap/makemap.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) 1992 Eric P. Allman.  All rights reserved.
  * Copyright (c) 1992, 1993
@@ -20,7 +20,7 @@ SM_IDSTR(copyright,
      Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n")
 
-SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.175 2001/12/28 22:44:01 ca Exp $")
+SM_IDSTR(id, "@(#)$Id: makemap.c,v 8.176 2002/06/27 23:41:04 gshapiro Exp $")
 
 
 #include <sys/types.h>
@@ -56,13 +56,15 @@ static void
 usage(progname)
 	char *progname;
 {
-	/* XXX break the usage output into multiple lines? it's too long */
 	sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
-		"Usage: %s [-C cffile] [-N] [-c cachesize] [-d] [-e] [-f] [-l] [-o] [-r] [-s] [-t delimiter] [-u] [-v] type mapname\n",
-		progname);
-#if _FFR_COMMENT_CHAR
-	/* add -D comment-char */
-#endif /* _FFR_COMMENT_CHAR */
+		      "Usage: %s [-C cffile] [-N] [-c cachesize] [-D commentchar]\n",
+		      progname);
+	sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
+		      "       %*s [-d] [-e] [-f] [-l] [-o] [-r] [-s] [-t delimiter]\n",
+		      (int) strlen(progname), "");
+	sm_io_fprintf(smioerr, SM_TIME_DEFAULT,
+		      "       %*s [-u] [-v] type mapname\n",
+		      (int) strlen(progname), "");
 	exit(EX_USAGE);
 }
 
@@ -161,11 +163,9 @@ main(argc, argv)
 			foldcase = false;
 			break;
 
-#if _FFR_COMMENT_CHAR
 		  case 'D':
 			comment = *optarg;
 			break;
-#endif /* _FFR_COMMENT_CHAR */
 
 		  case 'l':
 			smdb_print_available_types();