mirror of
https://github.com/nmap/nmap.git
synced 2026-08-04 14:49:29 +00:00
merge soc07 r4823:4827 - rename --services to --servicedb, add --versiondb
This commit is contained in:
parent
8a10d4fbd0
commit
c0e32d45df
1 changed files with 5 additions and 2 deletions
7
nmap.cc
7
nmap.cc
|
|
@ -518,7 +518,8 @@ int nmap_main(int argc, char *argv[]) {
|
|||
{"version", no_argument, 0, 'V'},
|
||||
{"verbose", no_argument, 0, 'v'},
|
||||
{"datadir", required_argument, 0, 0},
|
||||
{"services", required_argument, 0, 0},
|
||||
{"servicedb", required_argument, 0, 0},
|
||||
{"versiondb", required_argument, 0, 0},
|
||||
{"debug", optional_argument, 0, 'd'},
|
||||
{"help", no_argument, 0, 'h'},
|
||||
{"iflist", no_argument, 0, 0},
|
||||
|
|
@ -731,9 +732,11 @@ int nmap_main(int argc, char *argv[]) {
|
|||
}
|
||||
} else if (strcmp(long_options[option_index].name, "datadir") == 0) {
|
||||
o.datadir = strdup(optarg);
|
||||
} else if (strcmp(long_options[option_index].name, "services") == 0) {
|
||||
} else if (strcmp(long_options[option_index].name, "servicedb") == 0) {
|
||||
o.requested_data_files["nmap-services"] = optarg;
|
||||
o.fastscan++;
|
||||
} else if (strcmp(long_options[option_index].name, "versiondb") == 0) {
|
||||
o.requested_data_files["nmap-service-probes"] = optarg;
|
||||
} else if (optcmp(long_options[option_index].name, "append-output") == 0) {
|
||||
o.append_output = 1;
|
||||
} else if (strcmp(long_options[option_index].name, "noninteractive") == 0) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue