diff options
| author | Vadim Zhukov <zhuk@cvs.openbsd.org> | 2015-07-26 19:49:12 +0000 |
|---|---|---|
| committer | Vadim Zhukov <zhuk@cvs.openbsd.org> | 2015-07-26 19:49:12 +0000 |
| commit | be1eec7c05a713e8087af283dd477b976596afc9 (patch) | |
| tree | 40d5092c36472ba5055ea9f5960ec32515362c9b | |
| parent | 7376bfa721121970520af05294facf24505bff0c (diff) | |
Oops, CVS mismerged changes, resulting in compilable and mostly working,
but somewhat wrong code. Well, the CVS mismerged but I just missed.
| -rw-r--r-- | usr.bin/doas/doas.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/usr.bin/doas/doas.c b/usr.bin/doas/doas.c index 310d8799b89..44ccd6a67e3 100644 --- a/usr.bin/doas/doas.c +++ b/usr.bin/doas/doas.c @@ -1,4 +1,4 @@ -/* $OpenBSD: doas.c,v 1.24 2015/07/26 19:14:46 tedu Exp $ */ +/* $OpenBSD: doas.c,v 1.25 2015/07/26 19:49:11 zhuk Exp $ */ /* * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org> * @@ -379,9 +379,7 @@ main(int argc, char **argv, char **envp) parseconfig("/etc/doas.conf", 1); /* cmdline is used only for logging, no need to abort on truncate */ - (void) strlcpy(cmdline, argv[0], sizeof(cmdline)) < sizeof(cmdline); - if (strlcpy(cmdline, argv[0], sizeof(cmdline)) >= sizeof(cmdline)) - errx(1, "command line too long"); + (void) strlcpy(cmdline, argv[0], sizeof(cmdline)); for (i = 1; i < argc; i++) { if (strlcat(cmdline, " ", sizeof(cmdline)) >= sizeof(cmdline)) break; |