From owner-svn-src-stable-9@FreeBSD.ORG  Tue Aug 21 19:11:13 2012
Return-Path: <owner-svn-src-stable-9@FreeBSD.ORG>
Delivered-To: svn-src-stable-9@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 354D6106566C;
	Tue, 21 Aug 2012 19:11:13 +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 1F8A88FC0A;
	Tue, 21 Aug 2012 19:11:13 +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 q7LJBC34089141;
	Tue, 21 Aug 2012 19:11:12 GMT (envelope-from dim@svn.freebsd.org)
Received: (from dim@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7LJBC1U089139;
	Tue, 21 Aug 2012 19:11:12 GMT (envelope-from dim@svn.freebsd.org)
Message-Id: <201208211911.q7LJBC1U089139@svn.freebsd.org>
From: Dimitry Andric <dim@FreeBSD.org>
Date: Tue, 21 Aug 2012 19:11:12 +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: r239520 - stable/9/lib/libpam/modules/pam_krb5
X-BeenThere: svn-src-stable-9@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 9-stable src tree
	<svn-src-stable-9.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-9>
List-Post: <mailto:svn-src-stable-9@freebsd.org>
List-Help: <mailto:svn-src-stable-9-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-9>, 
	<mailto:svn-src-stable-9-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 21 Aug 2012 19:11:13 -0000

Author: dim
Date: Tue Aug 21 19:11:12 2012
New Revision: 239520
URL: http://svn.freebsd.org/changeset/base/239520

Log:
  MFC r239099:
  
  Fix two instances in pam_krb5(8), where the variable 'princ_name' could
  be used uninitialized.
  
  Found by:	clang 3.2
  Reviewed by:	des

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

Modified: stable/9/lib/libpam/modules/pam_krb5/pam_krb5.c
==============================================================================
--- stable/9/lib/libpam/modules/pam_krb5/pam_krb5.c	Tue Aug 21 19:07:28 2012	(r239519)
+++ stable/9/lib/libpam/modules/pam_krb5/pam_krb5.c	Tue Aug 21 19:11:12 2012	(r239520)
@@ -320,11 +320,11 @@ cleanup:
 	PAM_LOG("Done cleanup");
 cleanup2:
 	krb5_free_principal(pam_context, princ);
-	PAM_LOG("Done cleanup2");
-cleanup3:
 	if (princ_name)
 		free(princ_name);
+	PAM_LOG("Done cleanup2");
 
+cleanup3:
 	krb5_free_context(pam_context);
 
 	PAM_LOG("Done cleanup3");
@@ -779,11 +779,11 @@ cleanup:
 	PAM_LOG("Done cleanup");
 cleanup2:
 	krb5_free_principal(pam_context, princ);
-	PAM_LOG("Done cleanup2");
-cleanup3:
 	if (princ_name)
 		free(princ_name);
+	PAM_LOG("Done cleanup2");
 
+cleanup3:
 	krb5_free_context(pam_context);
 
 	PAM_LOG("Done cleanup3");