From owner-p4-projects  Fri Feb  7  7: 7:52 2003
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 04BAD37B405; Fri,  7 Feb 2003 07:07:51 -0800 (PST)
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 908D337B401
	for <perforce@freebsd.org>; Fri,  7 Feb 2003 07:07:50 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4121B43F93
	for <perforce@freebsd.org>; Fri,  7 Feb 2003 07:07:50 -0800 (PST)
	(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 h17F7nbv019487
	for <perforce@freebsd.org>; Fri, 7 Feb 2003 07:07:49 -0800 (PST)
	(envelope-from des@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h17F7n3k019484
	for perforce@freebsd.org; Fri, 7 Feb 2003 07:07:49 -0800 (PST)
Date: Fri, 7 Feb 2003 07:07:49 -0800 (PST)
Message-Id: <200302071507.h17F7n3k019484@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>
Subject: PERFORCE change 24780 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

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

Change 24780 by des@des.at.des.thinksec.com on 2003/02/07 07:07:07

	If the saved effective uid is the same as the current effective uid,
	just destroy the saved credentials and return.

Affected files ...

.. //depot/projects/openpam/lib/openpam_restore_cred.c#4 edit

Differences ...

==== //depot/projects/openpam/lib/openpam_restore_cred.c#4 (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/openpam_restore_cred.c#3 $
+ * $P4: //depot/projects/openpam/lib/openpam_restore_cred.c#4 $
  */
 
 #include <sys/param.h>
@@ -62,10 +62,12 @@
 		RETURNC(r);
 	if (scred == NULL)
 		RETURNC(PAM_SYSTEM_ERR);
-	if (seteuid(scred->euid) == -1 ||
-	    setgroups(scred->ngroups, scred->groups) == -1 ||
-	    setegid(scred->egid) == -1)
-		RETURNC(PAM_SYSTEM_ERR);
+	if (scred->euid != geteuid()) {
+		if (seteuid(scred->euid) == -1 ||
+		    setgroups(scred->ngroups, scred->groups) == -1 ||
+		    setegid(scred->egid) == -1)
+			RETURNC(PAM_SYSTEM_ERR);
+	}
 	pam_set_data(pamh, PAM_SAVED_CRED, NULL, NULL);
 	RETURNC(PAM_SUCCESS);
 }

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message