diff options
author | Lennart Poettering <lennart@poettering.net> | 2005-11-06 02:08:32 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2005-11-06 02:08:32 +0000 |
commit | fbce111b069aa1e4c701ed37ee1d9f6d6cefaac5 (patch) | |
tree | 73649d7fb6fc5d3742ad36ec0f1b7fc9f58b249e /avahi-daemon/main.c | |
parent | 05d7275c1d856fbe911e5e6af2c63bce8e766a53 (diff) |
* add two new configuration file options: "disable-publishing" and "disable-user-service-publishing"
* add two new errors: NOT_PERMITTED and NOT_SUPPORTED
* add two new publishing flags: AVAHI_PUBLISH_USE_MULTICAST, AVAHI_PUBLISH_USE_WIDE_AREA
* return NOT_SUPPORTED when user tries to add RRs in wide area domains - for now
git-svn-id: file:///home/lennart/svn/public/avahi/trunk@930 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe
Diffstat (limited to 'avahi-daemon/main.c')
-rw-r--r-- | avahi-daemon/main.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c index a903e63..44300ff 100644 --- a/avahi-daemon/main.c +++ b/avahi-daemon/main.c @@ -101,7 +101,8 @@ typedef struct { int use_chroot; #endif int modify_proc_title; - + + int disable_user_service_publishing; int publish_resolv_conf; char ** publish_dns_servers; int debug; @@ -486,6 +487,10 @@ 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) { @@ -723,7 +728,7 @@ static int run_server(DaemonConfig *c) { #ifdef HAVE_DBUS if (c->enable_dbus) { - if (dbus_protocol_setup(poll_api) < 0) { + if (dbus_protocol_setup(poll_api, config.disable_user_service_publishing) < 0) { if (c->fail_on_missing_dbus) goto finish; @@ -1012,7 +1017,8 @@ int main(int argc, char *argv[]) { config.use_chroot = 1; #endif config.modify_proc_title = 1; - + + config.disable_user_service_publishing = 0; config.publish_dns_servers = NULL; config.publish_resolv_conf = 0; config.use_syslog = 0; |