Fix error message when passing invalid command line arguments. I admit defeat, tedp...

[catta] / avahi-daemon / main.c

diff --git a/avahi-daemon/main.c b/avahi-daemon/main.c
index ca9c0346a81c55f7377153be12e8402829f88704..d0a3c85c9be96cec9abd696f8fa0e333020f0d45 100644 (file)
--- a/avahi-daemon/main.c
+++ b/avahi-daemon/main.c
@@ -267,7 +267,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
         case AVAHI_SERVER_RUNNING:
             avahi_log_info("Server startup complete. Host name is %s. Local service cookie is %u.", avahi_server_get_host_name_fqdn(s), avahi_server_get_local_service_cookie(s));
             
-            avahi_set_proc_title("%s: running [%s]", argv0, avahi_server_get_host_name_fqdn(s));
+            avahi_set_proc_title(argv0, "%s: running [%s]", argv0, avahi_server_get_host_name_fqdn(s));
             
             static_service_add_to_server();
             static_hosts_add_to_server();
@@ -286,7 +286,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
         case AVAHI_SERVER_COLLISION: {
             char *n;
             
-            avahi_set_proc_title("%s: collision", argv0);
+            avahi_set_proc_title(argv0, "%s: collision", argv0);
             
             static_service_remove_from_server();
             static_hosts_remove_from_server();
@@ -308,7 +308,7 @@ static void server_callback(AvahiServer *s, AvahiServerState state, void *userda
 
         case AVAHI_SERVER_REGISTERING:
 
-            avahi_set_proc_title("%s: registering [%s]", argv0, avahi_server_get_host_name_fqdn(s));
+            avahi_set_proc_title(argv0, "%s: registering [%s]", argv0, avahi_server_get_host_name_fqdn(s));
             
             static_service_remove_from_server();
             static_hosts_remove_from_server();
@@ -379,7 +379,6 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) {
 
     assert(c);
 
-    opterr = 0;
     while ((o = getopt_long(argc, argv, "hDkVf:rcs", long_options, NULL)) >= 0) {
 
         switch(o) {
@@ -426,7 +425,6 @@ static int parse_command_line(DaemonConfig *c, int argc, char *argv[]) {
                 c->debug = 1;
                 break;
             default:
-                fprintf(stderr, "Invalid command line argument: %c\n", o);
                 return -1;
         }
     }
@@ -442,7 +440,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 +539,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;
                 }
@@ -756,7 +758,7 @@ static int run_server(DaemonConfig *c) {
 #endif
             ) < 0) {
 
-            avahi_log_warn("WARNING: Failed to contact D-BUS daemon.");
+            avahi_log_warn("WARNING: Failed to contact D-Bus daemon.");
 
             if (c->fail_on_missing_dbus)
                 goto finish;
@@ -1193,7 +1195,7 @@ int main(int argc, char *argv[]) {
 #endif
         avahi_log_info("%s "PACKAGE_VERSION" starting up.", argv0);
 
-        avahi_set_proc_title("%s: starting up", argv0);
+        avahi_set_proc_title(argv0, "%s: starting up", argv0);
         
         if (run_server(&config) == 0)
             r = 0;