aboutsummaryrefslogtreecommitdiff
path: root/usr.sbin/sendmail
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1996-10-24 14:04:03 +0000
committerPeter Wemm <peter@FreeBSD.org>1996-10-24 14:04:03 +0000
commit0ee48eaae9acc622a5fe1359edc9e6a5ee17f1c4 (patch)
treee93f45f67bf818b26016e7fad5ef4c9e70a556d2 /usr.sbin/sendmail
parent2855b0343caec0ea137a78da9100846b15dcd29e (diff)
Notes
Diffstat (limited to 'usr.sbin/sendmail')
-rw-r--r--usr.sbin/sendmail/praliases/Makefile3
-rw-r--r--usr.sbin/sendmail/praliases/praliases.c10
-rw-r--r--usr.sbin/sendmail/smrsh/Makefile2
3 files changed, 10 insertions, 5 deletions
diff --git a/usr.sbin/sendmail/praliases/Makefile b/usr.sbin/sendmail/praliases/Makefile
index 602cee53cd4e..af13ac3215ce 100644
--- a/usr.sbin/sendmail/praliases/Makefile
+++ b/usr.sbin/sendmail/praliases/Makefile
@@ -2,8 +2,7 @@
PROG= praliases
MAN8= praliases.8
-CFLAGS+=-I${.CURDIR}/../src
-DPADD= ${LIBDBM}
+CFLAGS+=-I${.CURDIR}/../src -DNEWDB
.include "../../Makefile.inc"
.include <bsd.prog.mk>
diff --git a/usr.sbin/sendmail/praliases/praliases.c b/usr.sbin/sendmail/praliases/praliases.c
index 2c1cc0a07dea..24f318561c95 100644
--- a/usr.sbin/sendmail/praliases/praliases.c
+++ b/usr.sbin/sendmail/praliases/praliases.c
@@ -56,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
@@ -101,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));
@@ -128,6 +133,7 @@ main(argc, argv)
}
#ifdef NEWDB
}
-#endif
+#endif /* NEWDB */
+#endif /* NDBM */
exit(EX_OK);
}
diff --git a/usr.sbin/sendmail/smrsh/Makefile b/usr.sbin/sendmail/smrsh/Makefile
index 1cdf5d987dc2..0572ec608275 100644
--- a/usr.sbin/sendmail/smrsh/Makefile
+++ b/usr.sbin/sendmail/smrsh/Makefile
@@ -2,7 +2,7 @@
PROG= smrsh
MAN8= smrsh.8
-CFLAGS+=-I${.CURDIR}/../src -DNDBM -DNEWDB
+CFLAGS+=-I${.CURDIR}/../src -DNEWDB
BINDIR= /usr/libexec
.include <bsd.prog.mk>