- fix a regression caused by latest commit (long story made short: do not

  attempt to expand the local delivery buffer when relaying mail, it was
  kind of ok before but no longer is)
- use the same buffer for local deliveries to files and commands

tested by jmc@ and I

1 files changed, 3 insertions, 4 deletions

diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index c5008d42b21..ff74870100b 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: smtpd.h,v 1.193 2010/06/10 19:34:51 chl Exp $	*/
+/*	$OpenBSD: smtpd.h,v 1.194 2010/09/20 09:01:09 gilles Exp $	*/
 
 /*
  * Copyright (c) 2008 Gilles Chehade <gilles@openbsd.org>
@@ -40,6 +40,7 @@
 
 /* return and forward path size */
 #define MAX_PATH_SIZE		 256
+#define	MAX_RULEBUFFER_LEN	 256
 
 #define SMTPD_EXPIRE		 (4 * 24 * 60 * 60)
 #define SMTPD_USER		 "_smtpd"
@@ -302,10 +303,8 @@ struct rule {
 	struct cond			 r_condition;
 	enum action_type		 r_action;
 	union rule_dest {
-		char			 path[MAXPATHLEN];
+		char			 buffer[MAX_RULEBUFFER_LEN];
 		struct relayhost       	 relayhost;
-#define	MAXCOMMANDLEN	256
-		char			 command[MAXCOMMANDLEN];
 	}				 r_value;
 
 	char				*r_user;