aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathan Holstein <nathan.holstein@gmail.com>2015-08-05 11:01:36 -0400
committerNathan Holstein <nathan.holstein@gmail.com>2015-08-05 12:38:09 -0400
commit5c60366f659313e46a5b22ad27f50a3ba3ab8f15 (patch)
treec578181b1124f44453245ca0bc63578d6254a455
parent60a2fcc332e2fb69e2c76a2eb9541c0947ca3ca3 (diff)
parentb45246e2d368ac00f8558eacd84f1b751857db81 (diff)
downloadopendoas-5c60366f659313e46a5b22ad27f50a3ba3ab8f15.tar.gz
Merge doas.c 1.34 from OpenBSD CVS.
-rw-r--r--doas.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/doas.c b/doas.c
index 6fabd7b..f0cbab2 100644
--- a/doas.c
+++ b/doas.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: doas.c,v 1.32 2015/07/29 00:00:31 tedu Exp $ */
+/* $OpenBSD: doas.c,v 1.33 2015/07/30 17:04:33 tedu Exp $ */
/*
* Copyright (c) 2015 Ted Unangst <tedu@openbsd.org>
*
@@ -332,6 +332,7 @@ main(int argc, char **argv, char **envp)
int nflag = 0;
uid = getuid();
+
while ((ch = getopt(argc, argv, "C:nsu:")) != -1) {
switch (ch) {
case 'C':
@@ -361,7 +362,6 @@ main(int argc, char **argv, char **envp)
} else if ((!sflag && !argc) || (sflag && argc))
usage();
- uid = getuid();
pw = getpwuid(uid);
if (!pw)
err(1, "getpwuid failed");