Fixed code inclusion bug that was erroneously testing

defined(P2MP_SERVER) rather than P2MP_SERVER.

Fixed compile issues when USE_CRYPTO is undefined.


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@3075 e7ae566f-a301-0410-adde-c780ea21d3b5

2 files changed, 9 insertions, 6 deletions

diff --git a/manage.c b/manage.c
index cfe91aa..12ed97e 100644
--- a/manage.c
+++ b/manage.c
@@ -630,8 +630,10 @@ man_query_need_str (struct management *man, const char *type, const char *action
 static void
 man_forget_passwords (struct management *man)
 {
+#if defined(USE_CRYPTO) && defined(USE_SSL)
   ssl_purge_auth ();
   msg (M_CLIENT, "SUCCESS: Passwords were forgotten");
+#endif
 }
 
 static void
@@ -1375,9 +1377,10 @@ man_reset_client_socket (struct management *man, const bool exiting)
     }
   if (!exiting)
     {
+#if defined(USE_CRYPTO) && defined(USE_SSL)
       if (man->settings.flags & MF_FORGET_DISCONNECT)
-	 ssl_purge_auth ();
-
+	ssl_purge_auth ();
+#endif
       if (man->settings.flags & MF_SIGNAL) {
       	  int mysig = man_mod_signal (man, SIGUSR1);
 	  if (mysig >= 0)
diff --git a/syshead.h b/syshead.h
index 07f1970..da07a71 100644
--- a/syshead.h
+++ b/syshead.h
@@ -483,10 +483,10 @@ socket_defined (const socket_descriptor_t sd)
  * Enable deferred authentication?
  */
 #define CONFIGURE_DEF_AUTH /* this should be set by autoconf and config.h */
-#if defined(CONFIGURE_DEF_AUTH) && defined(P2MP_SERVER) && defined(ENABLE_PLUGIN)
+#if defined(CONFIGURE_DEF_AUTH) && P2MP_SERVER && defined(ENABLE_PLUGIN)
 #define PLUGIN_DEF_AUTH
 #endif
-#if defined(CONFIGURE_DEF_AUTH) && defined(P2MP_SERVER) && defined(ENABLE_MANAGEMENT)
+#if defined(CONFIGURE_DEF_AUTH) && P2MP_SERVER && defined(ENABLE_MANAGEMENT)
 #define MANAGEMENT_DEF_AUTH
 #endif
 #if defined(PLUGIN_DEF_AUTH) || defined(MANAGEMENT_DEF_AUTH)
@@ -497,10 +497,10 @@ socket_defined (const socket_descriptor_t sd)
  * Enable packet filter?
  */
 #define CONFIGURE_PF /* this should be set by autoconf and config.h */
-#if defined(CONFIGURE_PF) && defined(P2MP_SERVER) && defined(ENABLE_PLUGIN) && defined(HAVE_STAT)
+#if defined(CONFIGURE_PF) && P2MP_SERVER && defined(ENABLE_PLUGIN) && defined(HAVE_STAT)
 #define PLUGIN_PF
 #endif
-#if defined(CONFIGURE_PF) && defined(P2MP_SERVER) && defined(MANAGEMENT_DEF_AUTH)
+#if defined(CONFIGURE_PF) && P2MP_SERVER && defined(MANAGEMENT_DEF_AUTH)
 #define MANAGEMENT_PF
 #endif
 #if defined(PLUGIN_PF) || defined(MANAGEMENT_PF)