From b79445f4e4ef325d0497d833a9bbe98c1d52adfc Mon Sep 17 00:00:00 2001
From: Asanka Herath <asanka@secure-endpoints.com>
Date: Sat, 12 Sep 2009 00:44:43 -0400
Subject: [PATCH] Config changes

- Use custom implementations for strlcat() and strlcpy() because strcpy_s()
and strcat_s() have different behavior.

- Define NO_POSIX_LINKS to indicate that link/unlink operations don't
quite work the way they should. I.e. in-use files can't be replaced that
way.

- Change definitions of directory macros to use correct path tokens.

- Define NO_INETD to indicate that there's no inetd
---
 include/config.h.w32 | 43 ++++++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/include/config.h.w32 b/include/config.h.w32
index 017d025eb..8b480884f 100644
--- a/include/config.h.w32
+++ b/include/config.h.w32
@@ -95,17 +95,6 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #endif
 #endif
 
-#define _STR2(x) #x
-#define _STR(x) _STR2(x)
-
-#ifdef _HOST
-#define HOST _STR(_HOST)
-#endif
-
-#ifdef _HDB_DB_DIR
-#define HDB_DB_DIR _STR(_HDB_DB_DIR)
-#endif
-
 /* Feature macros */
 
 @FEATURE_DEFS@
@@ -856,12 +845,10 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 #define HAVE_STRING_H 1
 
 /* Define if you have the function `strlcat'. */
-#define HAVE_STRLCAT 1
-#define strlcat(d,s,dsz) strcat_s((d),(dsz),(s))
+/* #define HAVE_STRLCAT 1 */
 
 /* Define if you have the function `strlcpy'. */
-#define HAVE_STRLCPY 1
-#define strlcpy(d,s,dsz) strcpy_s((d),(dsz),(s))
+/* #define HAVE_STRLCPY 1 */
 
 /* Define if you have the function `strlwr'. */
 #define HAVE_STRLWR 1
@@ -1366,6 +1353,10 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define if you don't want to use mmap. */
 #define NO_MMAP 1
 
+/* Define to 1 if inetd will never be used to invoke any of the
+   daemons. */
+#define NO_INETD 1
+
 #define NO_RAND_EGD_METHOD 1
 
 /* Define if the Unix rand method is not defined */
@@ -1389,6 +1380,12 @@ static const char *const rcsid[] = { (const char *)rcsid, "@(#)" msg }
 /* Define to 1 if Unix sockets (AF_UNIX) are not available. */
 #define NO_UNIX_SOCKETS 1
 
+/* Define to 1 if POSIX link/unlink operations should be avoided.
+   This may be because the behavior of links are not not consistent
+   with POSIX or because the filesystem may not support POSIX
+   links. */
+#define NO_POSIX_LINKS 1
+
 /* Define this to enable old environment option in telnet. */
 /* #define OLD_ENVIRON 1 */
 
@@ -1492,17 +1489,21 @@ typedef unsigned short mode_t;
 
 /* Paths */
 
-#define SYSCONFDIR "%{COMMON_APPDATA}\\@PACKAGE@"
+#define SYSCONFDIR "%{COMMONCONFIG}"
+
+#define LIBDIR "%{LIBDIR}"
 
-#define LIBDIR "%{COMMON_APPDATA}\\@PACKAGE@\\lib"
+#if 0
 
-#define LIBEXECDIR "%{COMMON_APPDATA}\\@PACKAGE@\\libexec"
+#define LIBEXECDIR "%{LIBEXECDIR}"
 
-#define LOCALSTATEDIR "%{COMMON_APPDATA}\\@PACKAGE@"
+#define LOCALSTATEDIR "%{COMMONCONFIG}"
 
-#define SBINDIR "%{COMMON_APPDATA}\\@PACKAGE@\\sbin"
+#define SBINDIR "%{SBINDIR}"
 
-#define BINDIR "%{COMMON_APPDATA}\\@PACKAGE@\\bin"
+#define BINDIR "%{BINDIR}"
+
+#endif
 
 #endif	/* RC_INVOKED */
 
-- 
2.11.4.GIT