From 1c2858c681935a040cd2313e599b05a5dd40be95 Mon Sep 17 00:00:00 2001
From: Jesse Smith <jsmith@resonatingmedia.com>
Date: Tue, 3 Sep 2019 11:52:15 -0300
Subject: [PATCH] Removed unused login_style variable on Linux. Is only used
 when using BSD authorization.

---
 doas.c    | 5 ++++-
 execvpe.c | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/doas.c b/doas.c
index d336720..8faa125 100644
--- a/doas.c
+++ b/doas.c
@@ -329,7 +329,9 @@ main(int argc, char **argv)
 	int nflag = 0;
 	char cwdpath[PATH_MAX];
 	const char *cwd;
+        #if defined(USE_BSD_AUTH)
 	char *login_style = NULL;
+        #endif
 	char **envp;
 
 	#ifndef linux
@@ -343,11 +345,12 @@ main(int argc, char **argv)
 	uid = getuid();
 
 	while ((ch = getopt(argc, argv, "a:C:nsu:")) != -1) {
-/*	while ((ch = getopt(argc, argv, "a:C:Lnsu:")) != -1) { */
 		switch (ch) {
+                #if defined(USE_BSD_AUTH)
 		case 'a':
 			login_style = optarg;
 			break;
+                #endif
 		case 'C':
 			confpath = optarg;
 			break;
diff --git a/execvpe.c b/execvpe.c
index 7173bb6..e5f375e 100644
--- a/execvpe.c
+++ b/execvpe.c
@@ -60,7 +60,7 @@ execvpe(const char *name, char *const *argv, char *const *envp)
 	/*
 	 * Do not allow null name
 	 */
-	if (name == NULL || *name == '\0') {
+	if ( (! name) || (*name == '\0') ){
 		errno = ENOENT;
 		return (-1);
  	}