summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2014-06-16 22:50:55 +1000
committerDarren Tucker <dtucker@zip.com.au>2014-06-16 22:50:55 +1000
commitaf665bb7b092a59104db1e65577851cf35b86e32 (patch)
tree38610bae4d29df99df41c8aefbe13861302bcd29
parentf9696566fb41320820f3b257ab564fa321bb3751 (diff)
- (dtucker) [defines.h] Fix undef of _PATH_MAILDIR. From rak at debian via
OpenSMTPD and chl@
-rw-r--r--ChangeLog4
-rw-r--r--defines.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f4c6ea6bd..b8b3c0158 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120140616
2 - (dtucker) [defines.h] Fix undef of _PATH_MAILDIR. From rak at debian via
3 OpenSMTPD and chl@
4
120140612 520140612
2 - (dtucker) [configure.ac] Remove tcpwrappers support, support has already 6 - (dtucker) [configure.ac] Remove tcpwrappers support, support has already
3 been removed from sshd.c. 7 been removed from sshd.c.
diff --git a/defines.h b/defines.h
index 46f18d342..f1deafa61 100644
--- a/defines.h
+++ b/defines.h
@@ -25,7 +25,7 @@
25#ifndef _DEFINES_H 25#ifndef _DEFINES_H
26#define _DEFINES_H 26#define _DEFINES_H
27 27
28/* $Id: defines.h,v 1.181 2014/06/11 19:22:50 dtucker Exp $ */ 28/* $Id: defines.h,v 1.182 2014/06/16 12:50:56 dtucker Exp $ */
29 29
30 30
31/* Constants */ 31/* Constants */
@@ -405,7 +405,7 @@ struct winsize {
405 405
406/* user may have set a different path */ 406/* user may have set a different path */
407#if defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) 407#if defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY)
408# undef _PATH_MAILDIR MAILDIR 408# undef _PATH_MAILDIR
409#endif /* defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) */ 409#endif /* defined(_PATH_MAILDIR) && defined(MAIL_DIRECTORY) */
410 410
411#ifdef MAIL_DIRECTORY 411#ifdef MAIL_DIRECTORY