From owner-svn-src-all@FreeBSD.ORG  Tue Aug 21 19:13:54 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2C9D5106566C;
	Tue, 21 Aug 2012 19:13:54 +0000 (UTC) (envelope-from dim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 149868FC0A;
	Tue, 21 Aug 2012 19:13:54 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7LJDrnT089540;
	Tue, 21 Aug 2012 19:13:53 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7LJDrGd089538;
	Tue, 21 Aug 2012 19:13:53 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201208211913.q7LJDrGd089538@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 21 Aug 2012 19:13:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239521 - stable/9/lib/libpam/modules/pam_unix
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2012 19:13:54 -0000

Author: dim
Date: Tue Aug 21 19:13:53 2012
New Revision: 239521
URL: http://svn.freebsd.org/changeset/base/239521

Log:
  MFC r239100:
  
  Fix an instance in pam_krb5(8), where the variable 'user' could be used
  uninitialized.
  
  Found by:	clang 3.2
  Reviewed by:	des

Modified:
  stable/9/lib/libpam/modules/pam_unix/pam_unix.c
Directory Properties:
  stable/9/lib/libpam/   (props changed)

Modified: stable/9/lib/libpam/modules/pam_unix/pam_unix.c
==============================================================================
--- stable/9/lib/libpam/modules/pam_unix/pam_unix.c	Tue Aug 21 19:11:12 2012	(r239520)
+++ stable/9/lib/libpam/modules/pam_unix/pam_unix.c	Tue Aug 21 19:13:53 2012	(r239521)
@@ -96,13 +96,13 @@ pam_sm_authenticate(pam_handle_t *pamh, 
 	const char *pass, *user, *realpw, *prompt;
 
 	if (openpam_get_option(pamh, PAM_OPT_AUTH_AS_SELF)) {
-		pwd = getpwnam(getlogin());
+		user = getlogin();
 	} else {
 		retval = pam_get_user(pamh, &user, NULL);
 		if (retval != PAM_SUCCESS)
 			return (retval);
-		pwd = getpwnam(user);
 	}
+	pwd = getpwnam(user);
 
 	PAM_LOG("Got user: %s", user);