release/2.1.6_cvs

3 files changed, 54 insertions, 7 deletions

diff --git a/usr.sbin/sendmail/praliases/Makefile b/usr.sbin/sendmail/praliases/Makefile
index 498e1710bf87c..af13ac3215cec 100644
--- a/usr.sbin/sendmail/praliases/Makefile
+++ b/usr.sbin/sendmail/praliases/Makefile
@@ -1,9 +1,8 @@
-#	@(#)Makefile	8.1 (Berkeley) 6/7/93
+#	@(#)Makefile	8.2 (Berkeley) 9/21/96
 
 PROG=	praliases
-CFLAGS+=-I${.CURDIR}/../src
-DPADD=	${LIBDBM}
-NOMAN=	noman
+MAN8=	praliases.8
+CFLAGS+=-I${.CURDIR}/../src -DNEWDB
 
 .include "../../Makefile.inc"
 .include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/praliases/praliases.8 b/usr.sbin/sendmail/praliases/praliases.8
new file mode 100644
index 0000000000000..46082ba09e066
--- /dev/null
+++ b/usr.sbin/sendmail/praliases/praliases.8
@@ -0,0 +1,41 @@
+.\"	@(#)praliases.8	8.1 (Berkeley) 9/21/96
+.Dd April 25, 1996
+.Dt PRALIASES 1
+.Os BSD 3
+.Sh NAME
+.Nm praliases
+.Nd display system mail aliases
+.Sh SYNOPSIS
+.Nm praliases
+.Op Fl f Ar file
+.Sh DESCRIPTION
+The
+.Nm praliases
+utility displays the current system aliases,
+one per line, in no particular order.
+.Pp
+The options are as follows:
+.Bl -tag -width Ds
+.It Fl f
+Read the specified file instead of the default
+.Nm sendmail
+system aliases file.
+.El
+.Pp
+The
+.Nm praliases
+utility exits 0 on success, and >0 if an error occurs.
+.Sh FILES
+.Bl -tag -width /var/log/sendmail.stXX -compact
+.It Pa /etc/aliases
+The default
+.Nm sendmail
+system aliases file.
+.It Pa /etc/aliases.db
+The database version of the
+.Pa /etc/aliases
+file.
+.El
+.Sh SEE ALSO
+.Xr mailq 1 ,
+.Xr sendmail 8
diff --git a/usr.sbin/sendmail/praliases/praliases.c b/usr.sbin/sendmail/praliases/praliases.c
index 2c22279205eb3..24f318561c95d 100644
--- a/usr.sbin/sendmail/praliases/praliases.c
+++ b/usr.sbin/sendmail/praliases/praliases.c
@@ -39,10 +39,11 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)praliases.c	8.3 (Berkeley) 3/6/94";
+static char sccsid[] = "@(#)praliases.c	8.4 (Berkeley) 9/25/96";
 #endif /* not lint */
 
 #include <ndbm.h>
+#define NOT_SENDMAIL
 #include <sendmail.h>
 #ifdef NEWDB
 #include <db.h>
@@ -55,8 +56,10 @@ main(argc, argv)
 {
 	extern char *optarg;
 	extern int optind;
+#ifdef NDBM
 	DBM *dbp;
 	datum content, key;
+#endif
 	char *filename;
 	int ch;
 #ifdef NEWDB
@@ -100,8 +103,11 @@ main(argc, argv)
 					newdbkey.data);
 		}
 	}
-	else {
 #endif
+#ifdef NDBM
+#ifdef NEWDB
+	else {
+#endif /* NEWDB */
 		if ((dbp = dbm_open(filename, O_RDONLY, 0)) == NULL) {
 			(void)fprintf(stderr,
 			    "praliases: %s: %s\n", filename, strerror(errno));
@@ -127,6 +133,7 @@ main(argc, argv)
 		}
 #ifdef NEWDB
 	}
-#endif
+#endif /* NEWDB */
+#endif /* NDBM */
 	exit(EX_OK);
 }