diff options
author | Eric Faurot <eric@cvs.openbsd.org> | 2013-12-05 10:06:33 +0000 |
---|---|---|
committer | Eric Faurot <eric@cvs.openbsd.org> | 2013-12-05 10:06:33 +0000 |
commit | b542f7a9404b0a715f709457b6c133f58f42ea54 (patch) | |
tree | caf63a8f5701f698ebda81574ade3eba79d0304f | |
parent | 526fa7e80f177c3db26720f85b732365a0811a47 (diff) |
move defines around
-rw-r--r-- | usr.sbin/smtpd/smtpd-defines.h | 7 | ||||
-rw-r--r-- | usr.sbin/smtpd/smtpd.h | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/usr.sbin/smtpd/smtpd-defines.h b/usr.sbin/smtpd/smtpd-defines.h index c0c78f4bc51..a3fa6754032 100644 --- a/usr.sbin/smtpd/smtpd-defines.h +++ b/usr.sbin/smtpd/smtpd-defines.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd-defines.h,v 1.1 2013/05/24 17:03:14 eric Exp $ */ +/* $OpenBSD: smtpd-defines.h,v 1.2 2013/12/05 10:06:32 eric Exp $ */ /* * Copyright (c) 2013 Gilles Chehade <gilles@poolp.org> @@ -27,3 +27,8 @@ #define SMTPD_MAXPATHLEN 1024 #define SMTPD_MAXHOSTNAMELEN 256 #define SMTPD_MAXLINESIZE 2048 + +#define SMTPD_USER "_smtpd" +#define PATH_CHROOT "/var/empty" +#define SMTPD_QUEUE_USER "_smtpq" +#define PATH_SPOOL "/var/spool/smtpd" diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h index d84c0fa66b9..3385a2744df 100644 --- a/usr.sbin/smtpd/smtpd.h +++ b/usr.sbin/smtpd/smtpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: smtpd.h,v 1.439 2013/12/03 09:06:26 eric Exp $ */ +/* $OpenBSD: smtpd.h,v 1.440 2013/12/05 10:06:32 eric Exp $ */ /* * Copyright (c) 2008 Gilles Chehade <gilles@poolp.org> @@ -41,8 +41,6 @@ #define EXPAND_BUFFER 1024 #define SMTPD_QUEUE_EXPIRY (4 * 24 * 60 * 60) -#define SMTPD_USER "_smtpd" -#define SMTPD_QUEUE_USER "_smtpq" #define SMTPD_SOCKET "/var/run/smtpd.sock" #ifndef SMTPD_NAME #define SMTPD_NAME "OpenSMTPD" @@ -54,8 +52,6 @@ #define PATH_SMTPCTL "/usr/sbin/smtpctl" -#define PATH_CHROOT "/var/empty" -#define PATH_SPOOL "/var/spool/smtpd" #define PATH_OFFLINE "/offline" #define PATH_PURGE "/purge" #define PATH_TEMPORARY "/temporary" |