Merge pull request #101 from C4K3/bindport6
authorFelix Morgner <felix.morgner@gmail.com>
Thu, 26 Jan 2017 11:28:58 +0000 (12:28 +0100)
committerGitHub <noreply@github.com>
Thu, 26 Jan 2017 11:28:58 +0000 (12:28 +0100)
bindport6 defaults to bindport, rather than 64738

src/conf.c

index 557e0f86b18fc9b9e096ecf50de741321a1055a7..725aab6ab19bfe550ce27eb8890e0992c03dc080 100644 (file)
@@ -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);
                        }