Attachment 2208 Details for Bug 2061 – Patch to auth2.c to move check to see if permissible root login is being attempted prior to calling m->userauth

[patch] Patch to auth2.c to move check to see if permissible root login is being attempted prior to calling m->userauth

auth2_checkrootearlier.patch (text/plain), 983 bytes, created by V. Ram on 2013-01-15 19:29:42 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: V. Ram

Created: 2013-01-15 19:29:42 AEDT

Size: 983 bytes

patch

obsolete

>--- auth2.c.orig	2012-01-02 18:00:49.000000000 -0800
>+++ auth2.c	2013-01-15 00:12:23.000000000 -0800
>@@ -259,8 +259,12 @@
> 	/* try to authenticate user */
> 	m = authmethod_lookup(method);
> 	if (m != NULL && authctxt->failures < options.max_authtries) {
>-		debug2("input_userauth_request: try method %s", method);
>-		authenticated =	m->userauth(authctxt);
>+		/* Special handling for root */
>+		if (!(authctxt->pw->pw_uid == 0 &&
>+		      !auth_root_allowed(method))) {
>+		    debug2("input_userauth_request: try method %s", method);
>+		    authenticated =	m->userauth(authctxt);
>+		}
> 	}
> 	userauth_finish(authctxt, authenticated, method);
> 
>@@ -278,11 +282,6 @@
> 		fatal("INTERNAL ERROR: authenticated invalid user %s",
> 		    authctxt->user);
> 
>-	/* Special handling for root */
>-	if (authenticated && authctxt->pw->pw_uid == 0 &&
>-	    !auth_root_allowed(method))
>-		authenticated = 0;
>-
> 	/* Log before sending the reply */
> 	auth_log(authctxt, authenticated, method, " ssh2");
>

Actions: View | Diff

Attachments on bug 2061: 2208