Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

GH-199: change bro --help exit status from 1 to 0

Browse source 
Fixes #199
This commit is contained in:
Jon Siwek 2018-10-31 22:26:24 -05:00
parent 6e3ff156e0
commit cbaab3d4fa
3 changed files with 13 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-beta2-57 | 2018-10-31 22:26:24 -0500
* GH-199: change `bro --help` exit status from 1 to 0 (Jon Siwek, Corelight)
2.6-beta2-55 | 2018-10-30 09:59:44 -0500 2.6-beta2-55 | 2018-10-30 09:59:44 -0500
* Add a test with an encrypted MySQL connection (Vlad Grigorescu) * Add a test with an encrypted MySQL connection (Vlad Grigorescu)

2
VERSION
View file

@ -1 +1 @@
2.6-beta2-55 2.6-beta2-57

16
src/main.cc
View file

@ -157,7 +157,7 @@ const char* bro_dns_fake()
return "on"; return "on";
} }
void usage() void usage(int code = 1)
{ {
fprintf(stderr, "bro version %s\n", bro_version()); fprintf(stderr, "bro version %s\n", bro_version());
fprintf(stderr, "usage: %s [options] [file ...]\n", prog); fprintf(stderr, "usage: %s [options] [file ...]\n", prog);
@ -168,7 +168,7 @@ void usage()
fprintf(stderr, " -e|--exec <bro code> | augment loaded policies by given code\n"); fprintf(stderr, " -e|--exec <bro code> | augment loaded policies by given code\n");
fprintf(stderr, " -f|--filter <filter> | tcpdump filter\n"); fprintf(stderr, " -f|--filter <filter> | tcpdump filter\n");
fprintf(stderr, " -g|--dump-config | dump current config into .state dir\n"); fprintf(stderr, " -g|--dump-config | dump current config into .state dir\n");
fprintf(stderr, " -h|--help|-? | command line help\n"); fprintf(stderr, " -h|--help | command line help\n");
fprintf(stderr, " -i|--iface <interface> | read from given interface\n"); fprintf(stderr, " -i|--iface <interface> | read from given interface\n");
fprintf(stderr, " -p|--prefix <prefix> | add given prefix to policy file resolution\n"); fprintf(stderr, " -p|--prefix <prefix> | add given prefix to policy file resolution\n");
fprintf(stderr, " -r|--readfile <readfile> | read from given tcpdump file\n"); fprintf(stderr, " -r|--readfile <readfile> | read from given tcpdump file\n");
@ -217,7 +217,7 @@ void usage()
fprintf(stderr, "\n"); fprintf(stderr, "\n");
exit(1); exit(code);
} }
bool show_plugins(int level) bool show_plugins(int level)
@ -634,7 +634,7 @@ int main(int argc, char** argv)
break; break;
case 'h': case 'h':
usage(); usage(0);
break; break;
case 'i': case 'i':
@ -687,7 +687,7 @@ int main(int argc, char** argv)
case 'F': case 'F':
if ( dns_type != DNS_DEFAULT ) if ( dns_type != DNS_DEFAULT )
usage(); usage(1);
dns_type = DNS_FORCE; dns_type = DNS_FORCE;
break; break;
@ -709,7 +709,7 @@ int main(int argc, char** argv)
case 'P': case 'P':
if ( dns_type != DNS_DEFAULT ) if ( dns_type != DNS_DEFAULT )
usage(); usage(1);
dns_type = DNS_PRIME; dns_type = DNS_PRIME;
break; break;
@ -765,7 +765,7 @@ int main(int argc, char** argv)
case '?': case '?':
default: default:
usage(); usage(1);
break; break;
} }
@ -806,7 +806,7 @@ int main(int argc, char** argv)
// and Solaris provide /dev/urandom). // and Solaris provide /dev/urandom).
if ( interfaces.length() > 0 && read_files.length() > 0 ) if ( interfaces.length() > 0 && read_files.length() > 0 )
usage(); usage(1);
#ifdef USE_IDMEF #ifdef USE_IDMEF
char* libidmef_dtd_path_cstr = new char[libidmef_dtd_path.length() + 1]; char* libidmef_dtd_path_cstr = new char[libidmef_dtd_path.length() + 1];