bin/162164: Misplaced parenthesis in rshd.c

[Henning Petersen]

>Number:         162164
>Category:       bin
>Synopsis:       Misplaced parenthesis in rshd.c
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 30 09:30:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Henning Petersen
>Release:        FreeBSD-current
>Organization:
>Environment:
>Description:
Misplaced parenthesis in rshd.c .
>How-To-Repeat:

>Fix:
diff -u -p -r1.51 rshd.c
--- libexec/rshd/rshd.c	11 May 2005 02:41:39 -0000	1.51
+++ libexec/rshd/rshd.c	30 Oct 2011 08:53:04 -0000
@@ -317,7 +317,7 @@ doit(struct sockaddr *fromp)
 	}
 
 	if ((pam_err = pam_set_item(pamh, PAM_RUSER, ruser)) != PAM_SUCCESS ||
-	    (pam_err = pam_set_item(pamh, PAM_RHOST, rhost) != PAM_SUCCESS)) {
+	    (pam_err = pam_set_item(pamh, PAM_RHOST, rhost)) != PAM_SUCCESS) {
 		syslog(LOG_ERR|LOG_AUTH, "pam_set_item(): %s",
 		    pam_strerror(pamh, pam_err));
 		rshd_errx(1, "Login incorrect.");


Patch attached with submission follows:

diff -u -p -r1.51 rshd.c
--- libexec/rshd/rshd.c	11 May 2005 02:41:39 -0000	1.51
+++ libexec/rshd/rshd.c	30 Oct 2011 08:53:04 -0000
@@ -317,7 +317,7 @@ doit(struct sockaddr *fromp)
 	}
 
 	if ((pam_err = pam_set_item(pamh, PAM_RUSER, ruser)) != PAM_SUCCESS ||
-	    (pam_err = pam_set_item(pamh, PAM_RHOST, rhost) != PAM_SUCCESS)) {
+	    (pam_err = pam_set_item(pamh, PAM_RHOST, rhost)) != PAM_SUCCESS) {
 		syslog(LOG_ERR|LOG_AUTH, "pam_set_item(): %s",
 		    pam_strerror(pamh, pam_err));
 		rshd_errx(1, "Login incorrect.");


>Release-Note:
>Audit-Trail:
>Unformatted: