summaryrefslogtreecommitdiff
path: root/usr.sbin/smtpd/smtpd.h
diff options
context:
space:
mode:
authorGilles Chehade <gilles@cvs.openbsd.org>2012-05-12 21:49:32 +0000
committerGilles Chehade <gilles@cvs.openbsd.org>2012-05-12 21:49:32 +0000
commit68a7c9ca39a9e884b201871e3dde49ca22e1cf7c (patch)
treeb6d3e6436e093ce7f055e23c4d0fd3b372113267 /usr.sbin/smtpd/smtpd.h
parent88398091c2870742e25736ce29abbb3c04ae3c0d (diff)
- remove unused sources S_EXT, S_DYN and S_EXT from enum map_src
- continue simplification of parse.y - remove "for network", if we ever need it we can reimport, probably no one knows of that undocumented strange feature ;-) - change syntax for virtual domains configuration: accept for virtual vmap [...] <- wrong accept for virtual map vmap [...] <- right the reason for this change is that we will soon implement relay rules through maps and that keeping that syntax would make it inconsistent with the other rules. - update man pages for makemap and smtpd.conf to reflect changes ok eric@, looks ok chl@
Diffstat (limited to 'usr.sbin/smtpd/smtpd.h')
-rw-r--r--usr.sbin/smtpd/smtpd.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index 6b0b605cce2..98483b7256a 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.291 2012/05/12 18:41:10 gilles Exp $ */
+/* $OpenBSD: smtpd.h,v 1.292 2012/05/12 21:49:31 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -233,11 +233,8 @@ struct peer {
enum map_src {
S_NONE,
- S_DYN,
- S_DNS,
S_PLAIN,
- S_DB,
- S_EXT
+ S_DB
};
enum map_kind {