]> git.ipfire.org Git - thirdparty/openvpn.git/commitdiff
Fix #ifdefs for P2MP_SERVER
authorArne Schwabe <arne@rfc2549.org>
Thu, 30 May 2013 21:34:40 +0000 (23:34 +0200)
committerGert Doering <gert@greenie.muc.de>
Fri, 31 May 2013 07:47:29 +0000 (09:47 +0200)
(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>
src/openvpn/ssl.c
src/openvpn/ssl_common.h

index 12da365fee74cf88d3ac3044856cba8d9ff42e1a..088eea8a427232655840edb0ab5d603628e9835e 100644 (file)
@@ -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);
index 06ce0dd81cd74300deb184e027dfac191b483299..7e52f9a2f8fb87a2c1c2da8d93bf11a8a945b03a 100644 (file)
@@ -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.