nik/whois
1
0
Fork 0
mirror of https://github.com/rfc1036/whois.git synced 2026-04-03 06:40:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

whois: implement --no-recursion

Browse Source
This commit is contained in:
Marco d'Itri 2022-01-03 17:57:03 +01:00
parent a999d0ac6a
commit db2f94d5ff
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
whois.1
View File

@ -23,6 +23,7 @@ whois \- client for the whois directory service
.BR \-T \~
.IR TYPE [, TYPE ]...\~]
.RB [\~ \-\-verbose \~]
.RB [\~ \-\-no-recursion \~]
.I OBJECT
.B whois
@ -81,6 +82,9 @@ AS numbers and domains.
.BR BEWARE :
this implies that the IANA server will receive your complete query.
.TP 8
.B \-\-no-recursion
Disable recursion from registry to registrar servers.
.TP 8
.B \-\-verbose
Be verbose.
.TP 8

15
whois.c
View File

@ -1,5 +1,5 @@
/*
* Copyright (C) 1999-2021 Marco d'Itri <md@linux.it>.
* Copyright (C) 1999-2022 Marco d'Itri <md@linux.it>.
*
* 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
@ -61,7 +61,7 @@
#endif
/* Global variables */
int sockfd, verb = 0;
int sockfd, verb = 0, no_recursion = 0;
#ifdef ALWAYS_HIDE_DISCL
int hide_discl = HIDE_NOT_STARTED;
@ -84,6 +84,7 @@ int main(int argc, char *argv[])
{"version", no_argument, NULL, 1 },
{"verbose", no_argument, NULL, 2 },
{"help", no_argument, NULL, 3 },
{"no-recursion", no_argument, NULL, 4 },
{"server", required_argument, NULL, 'h'},
{"host", required_argument, NULL, 'h'},
{"port", required_argument, NULL, 'p'},
@ -227,6 +228,9 @@ int main(int argc, char *argv[])
case 'p':
port = strdup(optarg);
break;
case 4:
no_recursion = 1;
break;
case 3:
usage(EXIT_SUCCESS);
case 2:
@ -341,6 +345,8 @@ int handle_query(const char *hserver, const char *hport,
sockfd = openconn(server + 1, NULL);
free(server);
server = query_crsnic(sockfd, query);
if (no_recursion)
server = "";
break;
case 8:
if (verb)
@ -348,6 +354,8 @@ int handle_query(const char *hserver, const char *hport,
sockfd = openconn(server + 1, NULL);
free(server);
server = query_afilias(sockfd, query);
if (no_recursion)
server = "";
break;
case 0x0A:
p = convert_6to4(query);
@ -404,7 +412,7 @@ int handle_query(const char *hserver, const char *hport,
free(query_string);
/* recursion is fun */
if (server && !strchr(query, ' ')) {
if (!no_recursion && server && !strchr(query, ' ')) {
printf(_("\n\nFound a referral to %s.\n\n"), server);
handle_query(server, NULL, query, flags);
}
@ -1496,6 +1504,7 @@ void NORETURN usage(int error)
));
fprintf((EXIT_SUCCESS == error) ? stdout : stderr, _(
" --verbose explain what is being done\n"
" --no-recursion disable recursion from registry to registrar servers\n"
" --help display this help and exit\n"
" --version output version information and exit\n"
"\n"