summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlteo <lteo@openbsd.org>2014-03-26 03:16:39 +0000
committerlteo <lteo@openbsd.org>2014-03-26 03:16:39 +0000
commitc1241082d01fc0feec27deb8bd1659070a17c036 (patch)
treee0228f49d66144121a716e0eaa89e3c55811de6a
parentrc_stop() sends SIGTERM, not SIGKILL; reported by <yon dot fernandez dot (diff)
downloadwireguard-openbsd-c1241082d01fc0feec27deb8bd1659070a17c036.tar.xz
wireguard-openbsd-c1241082d01fc0feec27deb8bd1659070a17c036.zip
Ignore the -b option if cksum is called as-is (e.g. "cksum -b /bsd")
as documented on the cksum(1) man page. "looks right" deraadt@ ok millert@
-rw-r--r--bin/md5/md5.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/md5/md5.c b/bin/md5/md5.c
index bd9fd597102..270ea92be91 100644
--- a/bin/md5/md5.c
+++ b/bin/md5/md5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: md5.c,v 1.74 2014/03/20 22:03:56 tedu Exp $ */
+/* $OpenBSD: md5.c,v 1.75 2014/03/26 03:16:39 lteo Exp $ */
/*
* Copyright (c) 2001,2003,2005-2007,2010,2013,2014
@@ -330,7 +330,7 @@ main(int argc, char **argv)
}
if (hf->name == NULL)
hf = &functions[0]; /* default to cksum */
- hash_insert(&hl, hf, bflag);
+ hash_insert(&hl, hf, (hf->base64 == -1 ? 0 : bflag));
}
if (rflag || qflag) {