From owner-cvs-ports@FreeBSD.ORG Mon Dec 12 21:18:51 2005 Return-Path: X-Original-To: cvs-ports@FreeBSD.org Delivered-To: cvs-ports@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6DFDC16A425; Mon, 12 Dec 2005 21:18:51 +0000 (GMT) (envelope-from edwin@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 24CAE43DA2; Mon, 12 Dec 2005 21:18:28 +0000 (GMT) (envelope-from edwin@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id jBCLIQdI083055; Mon, 12 Dec 2005 21:18:26 GMT (envelope-from edwin@repoman.freebsd.org) Received: (from edwin@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id jBCLIQD7083054; Mon, 12 Dec 2005 21:18:26 GMT (envelope-from edwin) Message-Id: <200512122118.jBCLIQD7083054@repoman.freebsd.org> From: Edwin Groothuis Date: Mon, 12 Dec 2005 21:18:26 +0000 (UTC) To: ports-committers@FreeBSD.org, cvs-ports@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: ports/x11/xlockmore Makefile ports/x11/xlockmore/files patch-pam-passwd.c patch-pam-xlock.c X-BeenThere: cvs-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Dec 2005 21:18:51 -0000 edwin 2005-12-12 21:18:26 UTC FreeBSD ports repository Modified files: x11/xlockmore Makefile Added files: x11/xlockmore/files patch-pam-passwd.c patch-pam-xlock.c Log: xlockmore port improvements patch Some time ago I send PR about PAM support in xlockmore. Now I spend some time to work on xlockmore. I found that PAM works fine by default (with --enable-pam), but only with modules that does not requires root rights to authenticate. But almost all PAM configurations ends with pam_unix call. Here is the trouble. xlock drops root privileges after startup. I use BAD_PAM again to wrap this setuid(). IMHO, usage of BAD_PAM is right in this case. Also abort trap was fixed. Here was error in PAM_conv function. I'll send explanations of changes and situation to xlock-discuss mailing list later. May be fixes will be committed into next release of xlockmore. Here is attached diff against xlockmore port. It makes some changes in Makefile and drops two patches to files dir. New knobs added to Makefile and some old changed. Here is the description: - OPTIONS added for interactive configuration of xlockmore (make config). - WITH_PAM - enable common PAM support in xlock, but does not define BAD_PAM. So PAM modules that does not require root rights can be used (pam_pwdfile e.g.). - WITH_BAD_PAM - enable WITH_PAM and define BAD_PAM in config.h after 'configure'. So all PAM modules can be used, including pam_unix. - WITH_NICE_ONLY - enable only low-CPU modes. Good for old machines. - WITH_BLANK_ONLY - enable only 'blank' mode. Can be useful in some cases. PR: ports/90276 Submitted by: Yuri Y. Bushmelev Revision Changes Path 1.99 +35 -2 ports/x11/xlockmore/Makefile 1.1 +62 -0 ports/x11/xlockmore/files/patch-pam-passwd.c (new) 1.1 +17 -0 ports/x11/xlockmore/files/patch-pam-xlock.c (new)