From: Frederick Bruckman <bruckman@ntp.org>
Date: Wed, 25 Jun 2003 22:33:22 +0000 (-0500)
Subject: Fix merge botch.
X-Git-Tag: NTP_4_2_0~75
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4b372dbe336a9998eb2cc94508a67806719de20c;p=thirdparty%2Fntp.git

Fix merge botch.

bk: 3efa2332jOd2Cn_dkgAN3pgZudrFDQ
---

diff --git a/libntp/a_md5encrypt.c b/libntp/a_md5encrypt.c
index 44c5391883..42513ef534 100644
--- a/libntp/a_md5encrypt.c
+++ b/libntp/a_md5encrypt.c
@@ -16,7 +16,9 @@
 #include "ntp_string.h"
 #include "ntp_stdlib.h"
 
-/* Disable the openssl md5 includes because it clash with ours. */
+/* Disable the openssl md5 includes, because they'd clash with ours. */
+/* #define NO_MD5 */
+/* #define OPENSSL_NO_MD5 */
 #undef OPENSSL
 
 #include "ntp.h"