diff options
author | Lennart Poettering <lennart@poettering.net> | 2007-01-05 22:19:28 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2007-01-05 22:19:28 +0000 |
commit | 1438c0119533ea6374f233ee5dc9898b32f7e7c6 (patch) | |
tree | a8525398cd2a1072af3f9d7d8f8e22af63ad4eb1 /avahi-daemon/main.c | |
parent | 1c24d17c1001240306e054ea534c3aa69a45604b (diff) |
add new config options "publish-aaaa-on-ipv4=" and "publish-a-on-ipv6="
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@1366 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon/main.c')
-rw-r--r-- | avahi-daemon/main.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 33f1265..0b26446 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -442,7 +442,7 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) { static int is_yes(const char *s) { assert(s); - return *s == 'y' || *s == 'Y'; + return *s == 'y' || *s == 'Y' || *s == '1' || *s == 't' || *s == 'T'; } static int load_config_file(DaemonConfig *c) { @@ -541,8 +541,12 @@ static int load_config_file(DaemonConfig *c) { c->server_config.add_service_cookie = is_yes(p->value); else if (strcasecmp(p->key, "publish-dns-servers") == 0) { avahi_strfreev(c->publish_dns_servers); - c->publish_dns_servers = avahi_split_csv(p->value); - } else { + c->publish_dns_servers = avahi_split_csv(p->value); + } else if (strcasecmp(p->key, "publish-a-on-ipv6") == 0) + c->server_config.publish_a_on_ipv6 = is_yes(p->value); + else if (strcasecmp(p->key, "publish-aaaa-on-ipv4") == 0) + c->server_config.publish_aaaa_on_ipv4 = is_yes(p->value); + else { avahi_log_error("Invalid configuration key \"%s\" in group \"%s\"\n", p->key, g->name); goto finish; } |