From owner-p4-projects@FreeBSD.ORG  Wed Jun 18 02:15:37 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 10DC037B404; Wed, 18 Jun 2003 02:15:37 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id BAD8B37B401
	for <perforce@freebsd.org>; Wed, 18 Jun 2003 02:15:36 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 63BFE43F75
	for <perforce@freebsd.org>; Wed, 18 Jun 2003 02:15:36 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5I9Fa0U082933
	for <perforce@freebsd.org>; Wed, 18 Jun 2003 02:15:36 -0700 (PDT)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5I9FZ75082930
	for perforce@freebsd.org; Wed, 18 Jun 2003 02:15:35 -0700 (PDT)
Date: Wed, 18 Jun 2003 02:15:35 -0700 (PDT)
Message-Id: <200306180915.h5I9FZ75082930@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 33312 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Jun 2003 09:15:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=33312

Change 33312 by des@des.at.des.thinksec.com on 2003/06/18 02:14:58

	Checking the return value from pam_get_item(3) isn't enough, we also
	have to check that the item isn't NULL.
	
	Submitted by:	marcus

Affected files ...

.. //depot/projects/openpam/lib/pam_get_user.c#18 edit

Differences ...

==== //depot/projects/openpam/lib/pam_get_user.c#18 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/openpam/lib/pam_get_user.c#17 $
+ * $P4: //depot/projects/openpam/lib/pam_get_user.c#18 $
  */
 
 #include <sys/param.h>
@@ -43,7 +43,7 @@
 
 #include "openpam_impl.h"
 
-const char user_prompt[] = "Login:";
+static const char user_prompt[] = "Login:";
 
 /*
  * XSSO 4.2.1
@@ -64,7 +64,7 @@
 	if (pamh == NULL || user == NULL)
 		RETURNC(PAM_SYSTEM_ERR);
 	r = pam_get_item(pamh, PAM_USER, (const void **)user);
-	if (r == PAM_SUCCESS)
+	if (r == PAM_SUCCESS && *user != NULL)
 		RETURNC(PAM_SUCCESS);
 	if (prompt == NULL) {
 		r = pam_get_item(pamh, PAM_USER_PROMPT, (const void **)&prompt);