X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=client%2Fadh-main.c;h=0fe6af0c5b8f1f356df84439703c06f9b08d92f2;hb=7f8bbe29436e29cc2683955d642f79a10d62f67d;hp=88d876a7b1c214c0446301b78ff5856686ed3fed;hpb=0ebff22d9b5832b18444f7c680ca71e24fc3734e;p=adns.git diff --git a/client/adh-main.c b/client/adh-main.c index 88d876a..0fe6af0 100644 --- a/client/adh-main.c +++ b/client/adh-main.c @@ -4,16 +4,15 @@ * main program and useful subroutines */ /* - * This file is - * Copyright (C) 1997-2000 Ian Jackson - * - * It is part of adns, which is - * Copyright (C) 1997-2000 Ian Jackson - * Copyright (C) 1999 Tony Finch + * This file is part of adns, which is + * Copyright (C) 1997-2000,2003,2006 Ian Jackson + * Copyright (C) 1999-2000,2003,2006 Tony Finch + * Copyright (C) 1991 Massachusetts Institute of Technology + * (See the file INSTALL for full details.) * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) + * the Free Software Foundation; either version 3, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, @@ -90,6 +89,7 @@ void of_type(const struct optioninfo *oi, const char *arg, const char *arg2) { { adns_r_ptr, "ptr" }, { adns_r_mx, "mx" }, { adns_r_rp, "rp" }, + { adns_r_srv, "srv" }, { adns_r_addr, "addr" }, /* types with only one version */ @@ -99,16 +99,26 @@ void of_type(const struct optioninfo *oi, const char *arg, const char *arg2) { /* raw versions */ { adns_r_a, "a" }, + { adns_r_aaaa, "aaaa" }, { adns_r_ns_raw, "ns-" }, { adns_r_soa_raw, "soa-" }, { adns_r_ptr_raw, "ptr-" }, { adns_r_mx_raw, "mx-" }, { adns_r_rp_raw, "rp-" }, + { adns_r_srv_raw, "srv-" }, { adns_r_none, 0 } }; const struct typename *tnp; + unsigned long unknowntype; + char *ep; + + if (strlen(arg) > 4 && !memcmp(arg,"type",4) && + (unknowntype= strtoul(arg+4, &ep, 10), !*ep) && unknowntype < 65536) { + ov_type= unknowntype | adns_r_unknown; + return; + } for (tnp=typenames; tnp->type && strcmp(arg,tnp->desc);