[GNUnet-SVN] r33133 - gnunet/src/nat

[gnunet]

Author: grothoff
Date: 2014-04-23 17:57:34 +0200 (Wed, 23 Apr 2014)
New Revision: 33133

Modified:
   gnunet/src/nat/nat.c
Log:
-only complain about upnpc if it is actually enabled by config

Modified: gnunet/src/nat/nat.c
===================================================================
--- gnunet/src/nat/nat.c        2014-04-23 15:45:17 UTC (rev 33132)
+++ gnunet/src/nat/nat.c        2014-04-23 15:57:34 UTC (rev 33133)
@@ -1289,8 +1289,9 @@
     h->enable_nat_server = GNUNET_NO;
 
   /* Check for UPnP client, disable immediately if not available */
-  if (GNUNET_SYSERR ==
-      GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL))
+  if ( (GNUNET_YES == h->enable_upnp) &&
+       (GNUNET_SYSERR ==
+        GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL)) )
   {
     LOG (GNUNET_ERROR_TYPE_ERROR,
         _("UPnP enabled in configuration, but UPnP client `upnpc` command not 
found, disabling UPnP \n"));