mirror of
https://github.com/nmap/nmap.git
synced 2025-12-09 22:21:29 +00:00
Remove -q (quash argv to "pine" option).
This commit is contained in:
@@ -1,5 +1,8 @@
|
|||||||
# Nmap Changelog ($Id$); -*-text-*-
|
# Nmap Changelog ($Id$); -*-text-*-
|
||||||
|
|
||||||
|
o Removed the undocumented -q option, which renamed the nmap process
|
||||||
|
to something like "pine".
|
||||||
|
|
||||||
o Moved the Japanese man page from man1/jp to man1/ja. jp is a country
|
o Moved the Japanese man page from man1/jp to man1/ja. jp is a country
|
||||||
code while ja is a language code. Reported by Christian Neukirchen.
|
code while ja is a language code. Reported by Christian Neukirchen.
|
||||||
|
|
||||||
|
|||||||
@@ -343,7 +343,6 @@ void NmapOps::Initialize() {
|
|||||||
sourcesocklen = 0;
|
sourcesocklen = 0;
|
||||||
excludefd = NULL;
|
excludefd = NULL;
|
||||||
exclude_spec = NULL;
|
exclude_spec = NULL;
|
||||||
quashargv = 0;
|
|
||||||
inputfd = NULL;
|
inputfd = NULL;
|
||||||
idleProxy = NULL;
|
idleProxy = NULL;
|
||||||
portlist = NULL;
|
portlist = NULL;
|
||||||
|
|||||||
@@ -337,7 +337,6 @@ class NmapOps {
|
|||||||
bool adler32;
|
bool adler32;
|
||||||
FILE *excludefd;
|
FILE *excludefd;
|
||||||
char *exclude_spec;
|
char *exclude_spec;
|
||||||
int quashargv;
|
|
||||||
FILE *inputfd;
|
FILE *inputfd;
|
||||||
char *portlist; /* Ports list specified by user */
|
char *portlist; /* Ports list specified by user */
|
||||||
|
|
||||||
|
|||||||
14
nmap.cc
14
nmap.cc
@@ -1178,9 +1178,6 @@ void parse_options(int argc, char **argv) {
|
|||||||
fatal("Only 1 -p option allowed, separate multiple ranges with commas.");
|
fatal("Only 1 -p option allowed, separate multiple ranges with commas.");
|
||||||
o.portlist = strdup(optarg);
|
o.portlist = strdup(optarg);
|
||||||
break;
|
break;
|
||||||
case 'q':
|
|
||||||
o.quashargv++;
|
|
||||||
break;
|
|
||||||
case 'R':
|
case 'R':
|
||||||
o.resolve_all++;
|
o.resolve_all++;
|
||||||
break;
|
break;
|
||||||
@@ -1660,17 +1657,6 @@ int nmap_main(int argc, char *argv[]) {
|
|||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* more fakeargv junk, BTW malloc'ing extra space in argv[0] doesn't work */
|
|
||||||
if (o.quashargv) {
|
|
||||||
size_t fakeargvlen = strlen(FAKE_ARGV), argvlen = strlen(argv[0]);
|
|
||||||
if (argvlen < fakeargvlen)
|
|
||||||
fatal("If you want me to fake your argv, you need to call the program with a longer name. Try the full pathname, or rename it fyodorssuperdedouperportscanner");
|
|
||||||
strncpy(argv[0], FAKE_ARGV, fakeargvlen);
|
|
||||||
memset(&argv[0][fakeargvlen], '\0', strlen(&argv[0][fakeargvlen]));
|
|
||||||
for (i = 1; i < argc; i++)
|
|
||||||
memset(argv[i], '\0', strlen(argv[i]));
|
|
||||||
}
|
|
||||||
|
|
||||||
/* If he wants to bounce off of an FTP site, that site better damn well be reachable! */
|
/* If he wants to bounce off of an FTP site, that site better damn well be reachable! */
|
||||||
if (o.bouncescan) {
|
if (o.bouncescan) {
|
||||||
if (!inet_pton(AF_INET, ftp.server_name, &ftp.server)) {
|
if (!inet_pton(AF_INET, ftp.server_name, &ftp.server)) {
|
||||||
|
|||||||
1
nmap.h
1
nmap.h
@@ -246,7 +246,6 @@ void *realloc();
|
|||||||
sockets. Can also adjust with the -M command line option. */
|
sockets. Can also adjust with the -M command line option. */
|
||||||
#define MAX_SOCKETS 36
|
#define MAX_SOCKETS 36
|
||||||
|
|
||||||
#define FAKE_ARGV "pine" /* What ps and w should show if you use -q */
|
|
||||||
/* How do we want to log into ftp sites for */
|
/* How do we want to log into ftp sites for */
|
||||||
#define FTPUSER "anonymous"
|
#define FTPUSER "anonymous"
|
||||||
#define FTPPASS "-wwwuser@"
|
#define FTPPASS "-wwwuser@"
|
||||||
|
|||||||
@@ -1321,7 +1321,6 @@ class NmapOptionsTest(unittest.TestCase):
|
|||||||
# The following options are present in the Nmap source but are not
|
# The following options are present in the Nmap source but are not
|
||||||
# tested for because they are deprecated or not document or whatever.
|
# tested for because they are deprecated or not document or whatever.
|
||||||
# "-I",
|
# "-I",
|
||||||
# "-q",
|
|
||||||
# "--noninteractive",
|
# "--noninteractive",
|
||||||
# "--thc",
|
# "--thc",
|
||||||
# "--nogcc",
|
# "--nogcc",
|
||||||
|
|||||||
Reference in New Issue
Block a user