From nobody@FreeBSD.org  Sun Oct 30 09:20:42 2011
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C64251065672
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 30 Oct 2011 09:20:42 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from red.freebsd.org (red.freebsd.org [IPv6:2001:4f8:fff6::22])
	by mx1.freebsd.org (Postfix) with ESMTP id B64BE8FC17
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 30 Oct 2011 09:20:42 +0000 (UTC)
Received: from red.freebsd.org (localhost [127.0.0.1])
	by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p9U9KgWC071638
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 30 Oct 2011 09:20:42 GMT
	(envelope-from nobody@red.freebsd.org)
Received: (from nobody@localhost)
	by red.freebsd.org (8.14.4/8.14.4/Submit) id p9U9Kgju071637;
	Sun, 30 Oct 2011 09:20:42 GMT
	(envelope-from nobody)
Message-Id: <201110300920.p9U9Kgju071637@red.freebsd.org>
Date: Sun, 30 Oct 2011 09:20:42 GMT
From: Henning Petersen <henning.petersen@t-online.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Misplaced parenthesis in rshd.c
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         162164
>Category:       bin
>Synopsis:       Misplaced parenthesis in rshd.c
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    brueffer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 30 09:30:12 UTC 2011
>Closed-Date:    Sun Nov 06 14:04:38 CET 2011
>Last-Modified:  Sun Nov 06 14:04:38 CET 2011
>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:
State-Changed-From-To: open->patched 
State-Changed-By: brueffer 
State-Changed-When: Sun Oct 30 13:33:26 CET 2011 
State-Changed-Why:  
Committed to HEAD, will MFC in a week. Thanks! 


Responsible-Changed-From-To: freebsd-bugs->brueffer 
Responsible-Changed-By: brueffer 
Responsible-Changed-When: Sun Oct 30 13:33:26 CET 2011 
Responsible-Changed-Why:  
MFC reminder. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162164 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/162164: commit references a PR
Date: Sun, 30 Oct 2011 12:33:29 +0000 (UTC)

 Author: brueffer
 Date: Sun Oct 30 12:33:19 2011
 New Revision: 226937
 URL: http://svn.freebsd.org/changeset/base/226937
 
 Log:
   Fix a misplaced parenthesis.
   
   PR:		162164
   Submitted by:	Henning Petersen <henning.petersen@t-online.de>
   MFC after:	1 week
 
 Modified:
   head/libexec/rshd/rshd.c
 
 Modified: head/libexec/rshd/rshd.c
 ==============================================================================
 --- head/libexec/rshd/rshd.c	Sun Oct 30 12:23:06 2011	(r226936)
 +++ head/libexec/rshd/rshd.c	Sun Oct 30 12:33:19 2011	(r226937)
 @@ -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.");
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: brueffer 
State-Changed-When: Sun Nov 6 14:04:11 CET 2011 
State-Changed-Why:  
MFCs done. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=162164 
>Unformatted:
