From 4eda3e1752d0a2dc552213b5cdeb0dd11f2cc536 Mon Sep 17 00:00:00 2001
From: stskeeps <devnull@localhost>
Date: Thu, 30 Nov 2000 11:19:54 +0000
Subject: [PATCH] +- Fixed a typo in ssl.c

---
 Changes          |  1 +
 include/common.h | 12 ++++++------
 include/h.h      |  3 ++-
 include/sys.h    |  2 ++
 src/ssl.c        |  2 +-
 src/support.c    |  4 +++-
 6 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/Changes b/Changes
index cc8f9107c..12942ceb8 100644
--- a/Changes
+++ b/Changes
@@ -208,3 +208,4 @@
 - Added SMO *, all users
 - If a +r user is /who'ed, it shows a "r" in flags field. Suggested by
   Mirar.
+- Fixed a typo in ssl.c
diff --git a/include/common.h b/include/common.h
index eab4aa160..2abeef01c 100644
--- a/include/common.h
+++ b/include/common.h
@@ -193,13 +193,13 @@ extern unsigned char char_atribs[];
 #define ispunct(c) (!(char_atribs[(u_char)(c)]&(CNTRL|ALPHA|DIGIT)))
 #endif
 
-// #ifndef DMALLOC
+#ifndef DMALLOC
 extern char *MyMalloc();
-// #else
-// #define MyMalloc malloc
-// #define MyRealloc realloc
-// #define MyFree free
-// #endif
+#else
+#define MyMalloc malloc
+#define MyRealloc realloc
+#define MyFree free
+#endif
 extern void flush_connections();
 extern struct SLink *find_user_link( /* struct SLink *, struct Client * */ );
 
diff --git a/include/h.h b/include/h.h
index 25b8e818a..a915aba69 100644
--- a/include/h.h
+++ b/include/h.h
@@ -139,8 +139,9 @@ extern void inittoken PROTO(());
 extern void reset_help PROTO(());
 extern int find_exception(char *);	/* hidden host */
 
+#ifndef DMALLOC
 extern char *MyMalloc PROTO((int)), *MyRealloc PROTO((char *, int));
-
+#endif
 extern char *debugmode, *configfile, *sbrk0;
 extern char *getfield PROTO((char *));
 extern void get_sockhost PROTO((aClient *, char *));
diff --git a/include/sys.h b/include/sys.h
index 23faf13ec..ee66feded 100644
--- a/include/sys.h
+++ b/include/sys.h
@@ -86,6 +86,7 @@ extern	char	*rindex PROTO((char *, char));
 #else
 #include <sys/time.h>
 #endif
+#ifndef DMALLOC
 #if !defined(DEBUGMODE)
 # ifndef _WIN32
 #  define MyFree(x)	if ((x) != NULL) free(x)
@@ -95,6 +96,7 @@ extern	char	*rindex PROTO((char *, char));
 #else
 #define	free(x)		MyFree(x)
 #endif
+#endif
 #ifdef NEXT
 #define VOIDSIG int		/* whether signal() returns int of void */
 #else
diff --git a/src/ssl.c b/src/ssl.c
index 29eec4a2b..965226cd5 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -67,7 +67,7 @@ void init_ctx_client(void)
 
 	if (SSL_CTX_use_certificate_file(ctx_client, CERTF, SSL_FILETYPE_PEM) <= 0)
 	{
-		ircd_log("Failed to load SSL certificate %s (client)", "client.pem");
+		ircd_log("Failed to load SSL certificate %s (client)", CERTF);
 		exit(3);
 	}
 	if (SSL_CTX_use_PrivateKey_file(ctx_client, KEYF, SSL_FILETYPE_PEM) <= 0)
diff --git a/src/support.c b/src/support.c
index c5b3dfd88..a0e0074d9 100644
--- a/src/support.c
+++ b/src/support.c
@@ -202,7 +202,7 @@ int  inet_netof(in)
 
 #endif /* NEED_INET_NETOF */
 
-
+#ifndef DMALLOC
 #if defined(DEBUGMODE)
 void dumpcore(msg, p1, p2, p3, p4, p5, p6, p7, p8, p9)
 	char *msg, *p1, *p2, *p3, *p4, *p5, *p6, *p7, *p8, *p9;
@@ -287,6 +287,7 @@ char *MyMalloc(x)
 char *MyRealloc(x, y)
 	char *x;
 	size_t y;
+
 {
 	int  l;
 	char **s;
@@ -405,6 +406,7 @@ char *MyRealloc(x, y)
 	return ret;
 }
 #endif
+#endif
 /*
  * * read a string terminated by \r or \n in from a fd *
  *