bin/146186: commit references a PR

[dfilter service]

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

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at 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 at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"