diff options
| author | Christian Grothoff <christian@grothoff.org> | 2014-04-23 15:57:34 +0000 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2014-04-23 15:57:34 +0000 |
| commit | 289e908b9a51b9f91ef0ffd84963035c7f996b36 (patch) | |
| tree | 99057141ad98472abe4c387d96eb40ad245a300b /src/nat/nat.c | |
| parent | 62d484942e7d01314972d25b93aa7b1ba50e3add (diff) | |
| download | gnunet-289e908b9a51b9f91ef0ffd84963035c7f996b36.tar.gz gnunet-289e908b9a51b9f91ef0ffd84963035c7f996b36.zip | |
-only complain about upnpc if it is actually enabled by config
Diffstat (limited to 'src/nat/nat.c')
| -rw-r--r-- | src/nat/nat.c | 5 |
1 files 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, | |||
| 1289 | h->enable_nat_server = GNUNET_NO; | 1289 | h->enable_nat_server = GNUNET_NO; |
| 1290 | 1290 | ||
| 1291 | /* Check for UPnP client, disable immediately if not available */ | 1291 | /* Check for UPnP client, disable immediately if not available */ |
| 1292 | if (GNUNET_SYSERR == | 1292 | if ( (GNUNET_YES == h->enable_upnp) && |
| 1293 | GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL)) | 1293 | (GNUNET_SYSERR == |
| 1294 | GNUNET_OS_check_helper_binary ("upnpc", GNUNET_NO, NULL)) ) | ||
| 1294 | { | 1295 | { |
| 1295 | LOG (GNUNET_ERROR_TYPE_ERROR, | 1296 | LOG (GNUNET_ERROR_TYPE_ERROR, |
| 1296 | _("UPnP enabled in configuration, but UPnP client `upnpc` command not found, disabling UPnP \n")); | 1297 | _("UPnP enabled in configuration, but UPnP client `upnpc` command not found, disabling UPnP \n")); |