From 289e908b9a51b9f91ef0ffd84963035c7f996b36 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 23 Apr 2014 15:57:34 +0000 Subject: [PATCH] -only complain about upnpc if it is actually enabled by config --- src/nat/nat.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/nat/nat.c b/src/nat/nat.c index 4da4826d8..039544d57 100644 --- a/src/nat/nat.c +++ b/src/nat/nat.c @@ -1289,8 +1289,9 @@ GNUNET_NAT_register (const struct GNUNET_CONFIGURATION_Handle *cfg, 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")); -- 2.25.1