Stop exiting on cmdline overflow: it's used only for logging, so aborting

the whole process is stupid, and actually breaks things.

Noticed and analyzed by as well as input from nigel@.

Okay tedu@, espie@ and (if I understood correctly) hall@

diff --git a/doas.c b/doas.c
index 79639261f61ded5a007ad820c3c6be7590ea41ef..618027b0aed023d1746372b18e8d4de560685fe8 100644 (file)
--- a/doas.c
+++ b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.21 2015/07/24 06:36:42 zhuk Exp $ */
+/* $OpenBSD: doas.c,v 1.22 2015/07/26 17:24:02 zhuk Exp $ */
 /*
  * Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
  *
@@ -374,16 +374,18 @@ main(int argc, char **argv, char **envp)
                    target));
        parseconfig("/etc/doas.conf", 1);
 
-       cmd = argv[0];
+       /* 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");
        for (i = 1; i < argc; i++) {
                if (strlcat(cmdline, " ", sizeof(cmdline)) >= sizeof(cmdline))
-                       errx(1, "command line too long");
+                       break;
                if (strlcat(cmdline, argv[i], sizeof(cmdline)) >= sizeof(cmdline))
-                       errx(1, "command line too long");
+                       break;
        }
 
+       cmd = argv[0];
        if (!permit(uid, groups, ngroups, &rule, target, cmd,
            (const char**)argv + 1)) {
                syslog(LOG_AUTHPRIV | LOG_NOTICE,