Merge doas.c 1.34 from OpenBSD CVS.

diff --git a/doas.c b/doas.c
index 6fabd7bf1b9887dbf65f1d60f1f8cd906623b455..f0cbab295bfb265cc4c03f9bf2e4077c0e68d293 100644 (file)
--- 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");