From c721d0c3090cd2cb171fe397c0a5d23586865c71 Mon Sep 17 00:00:00 2001 From: Julian Kranz Date: Fri, 6 Jan 2012 17:25:12 +0100 Subject: [PATCH] --- --- src/iodined.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/iodined.c b/src/iodined.c index 9a99ccb..ae16690 100644 --- a/src/iodined.c +++ b/src/iodined.c @@ -818,10 +818,9 @@ handle_null_request(int tun_fd, int dns_fd, struct query *q, int domain_len) read = snprintf(out, sizeof(out), "%s-%s-%d-%d-%s-%s-%d", tmp[0], tmp[1], my_mtu, netmask, server6, client6, netmask6); - } - - read = snprintf(out, sizeof(out), "%s-%s-%d-%d", - tmp[0], tmp[1], my_mtu, netmask); + } else + read = snprintf(out, sizeof(out), "%s-%s-%d-%d", tmp[0], + tmp[1], my_mtu, netmask); //printf("%s\n", out); @@ -2299,7 +2298,7 @@ main(int argc, char **argv) srand(time(NULL)); fw_query_init(); - while ((choice = getopt(argc, argv, "vcsfhD6u:t:d:m:l:p:n:b:P:z:F:")) != -1) { + while ((choice = getopt(argc, argv, "6vcsfhDu:t:d:m:l:p:n:b:P:z:F:")) != -1) { switch(choice) { case 'v': version(); @@ -2371,7 +2370,7 @@ main(int argc, char **argv) check_superuser(usage); - if (argc != 3) + if (argc != 2 + v6) usage(); netsize = strchr(argv[0], '/');