From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 12 Aug 2011 15:02:53 +0000 (-0400)
Subject: Fix loop that calls authenticate().
X-Git-Tag: SUDO_1_8_2~10^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f4a0d095e3992addc5a9a8efd7127a4850b7ebe;p=sudo

Fix loop that calls authenticate().
If there was an error message from authenticate(), display it.
---

diff --git a/plugins/sudoers/auth/aix_auth.c b/plugins/sudoers/auth/aix_auth.c
index 1be5fcbfe..6abc48cc1 100644
--- a/plugins/sudoers/auth/aix_auth.c
+++ b/plugins/sudoers/auth/aix_auth.c
@@ -41,6 +41,7 @@
 # include <unistd.h>
 #endif /* HAVE_UNISTD_H */
 #include <pwd.h>
+#include <usersec.h>
 
 #include "sudoers.h"
 #include "sudo_auth.h"
@@ -52,26 +53,37 @@
 int
 aixauth_verify(struct passwd *pw, char *prompt, sudo_auth *auth)
 {
-    char *pass;
-    char *message = NULL;
-    int result, reenter = 0;
-    int rval = AUTH_FAILURE;
+    char *pass, *message = NULL;
+    int result = 1, reenter = 0;
+    int rval = AUTH_SUCCESS;
 
-    if (pass) {
-	/* XXX - should verify that S_AUTH1 is "NONE" or "SYSTEM" */
-	do {
-	    pass = auth_getpass(prompt, def_passwd_timeout * 60,
-		SUDO_CONV_PROMPT_ECHO_OFF);
-	    efree(message);
-	    result = authenticate(pw->pw_name, pass, &reenter, &message);
-	    zero_bytes(pass, strlen(pass));
-	    prompt = message;
-	} while (reenter);
-	/* XXX - should probably print message on failure. */
+    do {
+	pass = auth_getpass(prompt, def_passwd_timeout * 60,
+	    SUDO_CONV_PROMPT_ECHO_OFF);
+	if (pass == NULL)
+	    break;
 	efree(message);
-	if (result == 0)
-	    rval = AUTH_SUCCESS;
+	message = NULL;
+	result = authenticate(pw->pw_name, pass, &reenter, &message);
+	zero_bytes(pass, strlen(pass));
+	prompt = message;
+    } while (reenter);
+
+    if (result != 0) {
+	/* Display error message, if any. */
+	if (message != NULL) {
+	    struct sudo_conv_message msg;
+	    struct sudo_conv_reply repl;
+
+	    memset(&msg, 0, sizeof(msg));
+	    msg.msg_type = SUDO_CONV_ERROR_MSG;
+	    msg.msg = message;
+	    memset(&repl, 0, sizeof(repl));
+	    sudo_conv(1, &msg, &repl);
+	}
+	rval = pass ? AUTH_FAILURE : AUTH_INTR;
     }
+    efree(message);
     return rval;
 }