From owner-freebsd-bugs@FreeBSD.ORG  Mon May  3 07:40:25 2010
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 314611065673
	for <freebsd-bugs@hub.freebsd.org>;
	Mon,  3 May 2010 07:40:25 +0000 (UTC)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40])
	by mx1.freebsd.org (Postfix) with ESMTP id E89C98FC28
	for <freebsd-bugs@hub.freebsd.org>;
	Mon,  3 May 2010 07:40:24 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o437eOJI049012
	for <freebsd-bugs@freefall.freebsd.org>; Mon, 3 May 2010 07:40:24 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o437eOol049008;
	Mon, 3 May 2010 07:40:24 GMT (envelope-from gnats)
Date: Mon, 3 May 2010 07:40:24 GMT
Message-Id: <201005030740.o437eOol049008@freefall.freebsd.org>
To: freebsd-bugs@FreeBSD.org
From: dfilter@FreeBSD.ORG (dfilter service)
Cc: 
Subject: Re: bin/146186: commit references a PR
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: dfilter service <dfilter@FreeBSD.ORG>
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 May 2010 07:40:25 -0000

The following reply was made to PR bin/146186; it has been noted by GNATS.

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/146186: commit references a PR
Date: Mon,  3 May 2010 07:40:00 +0000 (UTC)

 Author: mm
 Date: Mon May  3 07:39:51 2010
 New Revision: 207555
 URL: http://svn.freebsd.org/changeset/base/207555
 
 Log:
   Code indent according to style(9).
   
   PR:		bin/146186
   Submitted by:	myself
   Approved by:	delphij (mentor)
   MFC after:	2 weeks
 
 Modified:
   head/lib/libpam/modules/pam_krb5/pam_krb5.c
 
 Modified: head/lib/libpam/modules/pam_krb5/pam_krb5.c
 ==============================================================================
 --- head/lib/libpam/modules/pam_krb5/pam_krb5.c	Mon May  3 07:32:50 2010	(r207554)
 +++ head/lib/libpam/modules/pam_krb5/pam_krb5.c	Mon May  3 07:39:51 2010	(r207555)
 @@ -199,33 +199,33 @@ pam_sm_authenticate(pam_handle_t *pamh, 
  		PAM_LOG("Skipping local user check");
  	else {
  
 -	/* Verify the local user exists (AFTER getting the password) */
 -	if (strchr(user, '@')) {
 -		/* get a local account name for this principal */
 -		krbret = krb5_aname_to_localname(pam_context, princ,
 -		    sizeof(luser), luser);
 -		if (krbret != 0) {
 -			PAM_VERBOSE_ERROR("Kerberos 5 error");
 -			PAM_LOG("Error krb5_aname_to_localname(): %s",
 -			    krb5_get_err_text(pam_context, krbret));
 -			retval = PAM_USER_UNKNOWN;
 -			goto cleanup2;
 -		}
 +		/* Verify the local user exists (AFTER getting the password) */
 +		if (strchr(user, '@')) {
 +			/* get a local account name for this principal */
 +			krbret = krb5_aname_to_localname(pam_context, princ,
 +			    sizeof(luser), luser);
 +			if (krbret != 0) {
 +				PAM_VERBOSE_ERROR("Kerberos 5 error");
 +				PAM_LOG("Error krb5_aname_to_localname(): %s",
 +				    krb5_get_err_text(pam_context, krbret));
 +				retval = PAM_USER_UNKNOWN;
 +				goto cleanup2;
 +			}
  
 -		retval = pam_set_item(pamh, PAM_USER, luser);
 -		if (retval != PAM_SUCCESS)
 -			goto cleanup2;
 +			retval = pam_set_item(pamh, PAM_USER, luser);
 +			if (retval != PAM_SUCCESS)
 +				goto cleanup2;
  
 -		PAM_LOG("PAM_USER Redone");
 -	}
 +			PAM_LOG("PAM_USER Redone");
 +		}
  
 -	pwd = getpwnam(user);
 -	if (pwd == NULL) {
 -		retval = PAM_USER_UNKNOWN;
 -		goto cleanup2;
 -	}
 +		pwd = getpwnam(user);
 +		if (pwd == NULL) {
 +			retval = PAM_USER_UNKNOWN;
 +			goto cleanup2;
 +		}
  
 -	PAM_LOG("Done getpwnam()");
 +		PAM_LOG("Done getpwnam()");
  	}
  
  	/* Get a TGT */
 _______________________________________________
 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"