From: Felix Morgner Date: Thu, 26 Jan 2017 11:28:58 +0000 (+0100) Subject: Merge pull request #101 from C4K3/bindport6 X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=ea29a328d04bdffd8397fa3ff515f09f48c617f1;hp=fac630135664fda26338d403041b6b6e558a2d6b Merge pull request #101 from C4K3/bindport6 bindport6 defaults to bindport, rather than 64738 --- diff --git a/src/conf.c b/src/conf.c index 557e0f8..725aab6 100644 --- a/src/conf.c +++ b/src/conf.c @@ -252,7 +252,10 @@ int getIntConf(param_t param) case BINDPORT6: setting = config_lookup(&configuration, "bindport6"); if (!setting) - return DEFAULT_BINDPORT; + /* If bindport6 is not specified, we default + * to whatever bindport is, rather than always + * default to 64738 */ + return getIntConf(BINDPORT); else { return config_setting_get_int(setting); }