remove a deprecation warning (patch from DamjanGeorgievski) (closes #129)

[catta] / avahi-dnsconfd / main.c

diff --git a/avahi-dnsconfd/main.c b/avahi-dnsconfd/main.c
index b384a038e0df19196c76cf40a7d2f702afec1435..1f3e3b8f2af1d1e007192a124e5e996bb40d738b 100644 (file)
--- a/avahi-dnsconfd/main.c
+++ b/avahi-dnsconfd/main.c
@@ -202,8 +202,18 @@ static char *concat_dns_servers(AvahiIfIndex interface) {
     
     for (i = servers; i; i = i->servers_next)
         if (i->interface == interface || interface <= 0) {
+            DNSServerInfo *j;
             char *t;
 
+            /* Filter out double entries */
+            for (j = servers; j != i; j = j->servers_next)
+                if (j->interface == interface || interface <= 0)
+                    if (strcmp(i->address, j->address) == 0)
+                        break;
+
+            if (j != i)
+                continue;
+            
             if (!r)
                 t = avahi_strdup(i->address);
             else
@@ -383,6 +393,7 @@ static int parse_command_line(int argc, char *argv[]) {
         { "version",   no_argument,       NULL, 'V' },
         { "refresh",   no_argument,       NULL, 'r' },
         { "check",     no_argument,       NULL, 'c' },
+        { NULL, 0, NULL, 0 }
     };
 
     opterr = 0;
@@ -408,7 +419,7 @@ static int parse_command_line(int argc, char *argv[]) {
                 command = DAEMON_CHECK;
                 break;
             default:
-                fprintf(stderr, "Invalid command line argument: %c\n", c);
+                fprintf(stderr, "Invalid command line argument: %s\n", argv[optind-1]);
                 return -1;
         }
     }