Attachment 143425 Details for Bug 83099 – Proposed fix

[patch] Proposed fix

file_83099.txt (text/plain), 1.29 KB, created by Dag-Erling Smørgrav on 2014-06-05 21:39:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dag-Erling Smørgrav

Created: 2014-06-05 21:39:29 UTC

Size: 1.29 KB

patch

obsolete

>Index: pam_login_access.c
>===================================================================
>--- pam_login_access.c	(revision 267126)
>+++ pam_login_access.c	(working copy)
>@@ -79,7 +79,14 @@
> 
> 	gethostname(hostname, sizeof hostname);
> 
>-	if (rhost == NULL || *(const char *)rhost == '\0') {
>+	if (rhost != NULL && *(const char *)rhost != '\0') {
>+		PAM_LOG("Checking login.access for user %s from host %s",
>+		    (const char *)user, (const char *)rhost);
>+		if (login_access(user, rhost) != 0)
>+			return (PAM_SUCCESS);
>+		PAM_VERBOSE_ERROR("%s is not allowed to log in from %s",
>+		    user, rhost);
>+	} else if (tty != NULL || *(const char *)tty != '\0') {
> 		PAM_LOG("Checking login.access for user %s on tty %s",
> 		    (const char *)user, (const char *)tty);
> 		if (login_access(user, tty) != 0)
>@@ -87,12 +94,8 @@
> 		PAM_VERBOSE_ERROR("%s is not allowed to log in on %s",
> 		    user, tty);
> 	} else {
>-		PAM_LOG("Checking login.access for user %s from host %s",
>-		    (const char *)user, (const char *)rhost);
>-		if (login_access(user, rhost) != 0)
>-			return (PAM_SUCCESS);
>-		PAM_VERBOSE_ERROR("%s is not allowed to log in from %s",
>-		    user, rhost);
>+		PAM_VERBOSE_ERROR("PAM_RHOST or PAM_TTY required");
>+		return (PAM_AUTHINFO_UNAVAIL);
> 	}
> 
> 	return (PAM_AUTH_ERR);

Actions: View | Diff

Attachments on bug 83099: 143425