diff options
| author | Lennart Poettering <lennart@poettering.net> | 2005-11-16 14:06:19 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2005-11-16 14:06:19 +0000 |
| commit | f2af862d6619dba39ba056c9ffb5fc9c7e9fc59c (patch) | |
| tree | c743454ea35c4f3e2aa485563878a776b46fed53 /avahi-daemon | |
| parent | a3d45b39608418e261f34b3b3286b80e4878d25c (diff) | |
update man pages
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@981 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon')
| -rw-r--r-- | avahi-daemon/avahi-daemon.conf | 4 | ||||
| -rw-r--r-- | avahi-daemon/main.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/avahi-daemon/avahi-daemon.conf b/avahi-daemon/avahi-daemon.conf index 14b4a0a..f2ffcc3 100644 --- a/avahi-daemon/avahi-daemon.conf +++ b/avahi-daemon/avahi-daemon.conf @@ -30,13 +30,13 @@ use-ipv6=no #use-iff-running=no #enable-dbus=yes #disallow-other-stacks=no -#disable-publishing=no -#disable-user-service-publishing=no [wide-area] enable-wide-area=yes [publish] +#disable-publishing=no +#disable-user-service-publishing=no #add-service-cookie=yes #publish-addresses=yes #publish-hinfo=yes diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index 12af74c..da19868 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -487,10 +487,6 @@ static int load_config_file(DaemonConfig *c) { c->server_config.use_iff_running = is_yes(p->value); else if (strcasecmp(p->key, "disallow-other-stacks") == 0) c->server_config.disallow_other_stacks = is_yes(p->value); - else if (strcasecmp(p->key, "disable-publishing") == 0) - c->server_config.disable_publishing = is_yes(p->value); - else if (strcasecmp(p->key, "disable-user-service-publishing") == 0) - c->disable_user_service_publishing = is_yes(p->value); #ifdef HAVE_DBUS else if (strcasecmp(p->key, "enable-dbus") == 0) { @@ -526,6 +522,10 @@ static int load_config_file(DaemonConfig *c) { c->server_config.publish_domain = is_yes(p->value); else if (strcasecmp(p->key, "publish-resolv-conf-dns-servers") == 0) c->publish_resolv_conf = is_yes(p->value); + else if (strcasecmp(p->key, "disable-publishing") == 0) + c->server_config.disable_publishing = is_yes(p->value); + else if (strcasecmp(p->key, "disable-user-service-publishing") == 0) + c->disable_user_service_publishing = is_yes(p->value); else if (strcasecmp(p->key, "add-service-cookie") == 0) c->server_config.add_service_cookie = is_yes(p->value); else if (strcasecmp(p->key, "publish-dns-servers") == 0) { |