On Fri, Jun 21, 2013 at 08:29:00AM -0400, Richard Guy Briggs wrote:
On Fri, Jun 21, 2013 at 04:38:16AM +0400, Dmitry V. Levin wrote:
> On Tue, Jun 11, 2013 at 11:30:43AM -0400, Richard Guy Briggs wrote:
> > On Mon, Jun 10, 2013 at 04:59:37PM -0400, Richard Guy Briggs wrote:
> > > On Wed, Jun 05, 2013 at 02:54:09AM +0400, Dmitry V. Levin wrote:
> > > > On Thu, May 23, 2013 at 10:29:59AM -0400, Richard Guy Briggs wrote:
> > > > > Most commands are entered one line at a time and processed as
complete lines
> > > > > in non-canonical mode. Commands that interactively require a
password, enter
> > > > > canonical mode with echo set to off to do this. This feature
(icanon and
> > > > > !echo) can be used to avoid logging passwords by audit while
still logging the
> > > > > rest of the command.
> > > > >
> > > > > Adding a member to the struct audit_tty_status passed in by
pam_tty_audit
> > > > > allows control of logging passwords per task.
> > > >
> > > > Sorry for the long delay with review. Please see my comments below.
> > >
> > > Ditto...
> >
> > Please find a new patch at the end...
>
> The patch looks OK. If commit message contained a ChangeLog-style entry
> for the change (see README-hacking file), it would be ready for commit.
Here you go:
I found two bugs in the patch, so since it is already committed, here's
a patch to fix the bugs. The previous patch doesn't break compile or
previous functionality, but the new functionality just doesn't work.
The patch before it worked fine before the autoconf tweaking.
From: Richard Guy Briggs <rgb(a)redhat.com>
Date: Tue, 25 Jun 2013 01:42:34 -0400
Subject: [PATCH] pam_tty_audit: fix two log_passwd bugs that crept in during patch review
* configure.in: ac_cv_member_struct_audit_tty_status_log_passwd misspelled
* modules/pam_tty_audit/Makefile.am: compiler flags needed propagating for
pam_tty_audit.c
Signed-off-by: Richard Guy Briggs <rgb(a)redhat.com>
---
configure.in | 2 +-
modules/pam_tty_audit/Makefile.am | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/configure.in b/configure.in
index b92d9ac..75b4a20 100644
--- a/configure.in
+++ b/configure.in
@@ -398,7 +398,7 @@ AC_SUBST(LIBAUDIT)
AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS],
[test "x$HAVE_AUDIT_TTY_STATUS" = xyes])
AM_CONDITIONAL([HAVE_AUDIT_TTY_STATUS_LOG_PASSWD],
- [test "x$ac_cv_member_audit_tty_status_log_passwd" = xyes])
+ [test "x$ac_cv_member_struct_audit_tty_status_log_passwd" = xyes])
AC_CHECK_HEADERS(xcrypt.h crypt.h)
AS_IF([test "x$ac_cv_header_xcrypt_h" = "xyes"],
diff --git a/modules/pam_tty_audit/Makefile.am b/modules/pam_tty_audit/Makefile.am
index 6378483..2e2f098 100644
--- a/modules/pam_tty_audit/Makefile.am
+++ b/modules/pam_tty_audit/Makefile.am
@@ -16,6 +16,9 @@ XMLS = README.xml pam_tty_audit.8.xml
securelibdir = $(SECUREDIR)
AM_CFLAGS = -I$(top_srcdir)/libpam/include -I$(top_srcdir)/libpamc/include
++if HAVE_AUDIT_TTY_STATUS_LOG_PASSWD
++ AM_CFLAGS += -DHAVE_AUDIT_TTY_STATUS_LOG_PASSWD
++endif
AM_LDFLAGS = -no-undefined -avoid-version -module
if HAVE_VERSIONING
AM_LDFLAGS += -Wl,--version-script=$(srcdir)/../modules.map
--
1.7.1
> ldv
- RGB
- RGB
--
Richard Guy Briggs <rbriggs(a)redhat.com>
Senior Software Engineer
Kernel Security
AMER ENG Base Operating Systems
Remote, Ottawa, Canada
Voice: +1.647.777.2635
Internal: (81) 32635
Alt: +1.613.693.0684x3545