X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fresolve-host%2Fresolve-host.c;h=4b46cdfa16cd7ff312be7863a8d456d7d66688fd;hp=987b43a0cb9707e0c14c73f301df9f3519408116;hb=de292aa1dd1942e151ff034fcb88504a86742f97;hpb=601185b43da638b1c74153deae01dbd518680889 diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c index 987b43a0c..4b46cdfa1 100644 --- a/src/resolve-host/resolve-host.c +++ b/src/resolve-host/resolve-host.c @@ -37,7 +37,7 @@ static int arg_family = AF_UNSPEC; static int arg_ifindex = 0; -static uint16_t arg_type = 0; +static int arg_type = 0; static uint16_t arg_class = 0; static bool arg_legend = true; @@ -316,6 +316,7 @@ static int resolve_record(sd_bus *bus, const char *name) { if (r < 0) return bus_log_create_error(r); + assert((uint16_t) arg_type == arg_type); r = sd_bus_message_append(req, "sqq", name, arg_class, arg_type); if (r < 0) return bus_log_create_error(r); @@ -482,11 +483,12 @@ static int parse_argv(int argc, char *argv[]) { return 0; } - r = dns_type_from_string(optarg, &arg_type); - if (r < 0) { + arg_type = dns_type_from_string(optarg); + if (arg_type < 0) { log_error("Failed to parse RR record type %s", optarg); return r; } + assert(arg_type > 0 && (uint16_t) arg_type == arg_type); break;