From: Arne Schwabe <arne@rfc2549.org>
Date: Thu, 30 May 2013 21:34:40 +0000 (+0200)
Subject: Fix #ifdefs for P2MP_SERVER
X-Git-Tag: v2.4_alpha1~558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1eb9a1271053fa95fbe8e7e973a47cce529d673d;p=thirdparty%2Fopenvpn.git

Fix #ifdefs for P2MP_SERVER

(Fix check introduced by commit a8be73799be1639, testing with #ifdef
instead of #if - P2MP_SERVER is always defined, and can be "0" or "1")

Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <1369949680-9499-1-git-send-email-arne@rfc2549.org>
URL: http://article.gmane.org/gmane.network.openvpn.devel/7637

Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 12da365fe..088eea8a4 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -2043,7 +2043,7 @@ key_method_2_read (struct buffer *buf, struct tls_multi *multi, struct tls_sessi
   username_status = read_string (buf, up->username, USER_PASS_LEN);
   password_status = read_string (buf, up->password, USER_PASS_LEN);
 
-#ifdef P2MP_SERVER
+#if P2MP_SERVER
   /* get peer info from control channel */
   free (multi->peer_info);
   multi->peer_info = read_string_alloc (buf);
diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h
index 06ce0dd81..7e52f9a2f 100644
--- a/src/openvpn/ssl_common.h
+++ b/src/openvpn/ssl_common.h
@@ -485,7 +485,7 @@ struct tls_multi
   time_t tas_last;
 #endif
 
-#ifdef P2MP_SERVER
+#if P2MP_SERVER
   /*
    * A multi-line string of general-purpose info received from peer
    * over control channel.