[SCM] GNU Inetutils branch, master, updated. inetutils-1_9_1-192-g728b8f7

[Mats Erik Andersson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Inetutils ".

The branch, master has been updated
       via  728b8f78c398b64c9e8c87aef883d83391c49482 (commit)
      from  430bcddb8ca05fe57a9fbe1119732f9b77b58fe3 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=728b8f78c398b64c9e8c87aef883d83391c49482


commit 728b8f78c398b64c9e8c87aef883d83391c49482
Author: Mats Erik Andersson <address@hidden>
Date:   Fri Oct 19 15:32:45 2012 +0200

    syslogd: Portability of utmp reading.

diff --git a/ChangeLog b/ChangeLog
index 4a3b957..b7f87fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-10-19  Mats Erik Andersson  <address@hidden>
+
+       syslogd: Portability of utmp.  Disclosed by Solaris 11.
+
+       * src/syslogd.c (wallmsg): Call read_utmp() with the
+       file argument UTMP_FILE, not PATH_UTMP.
+       * talkd/process.c (find_user): Likewise.
+
+       * tests/syslogd.sh (USER): New variable.
+       <verbose mode>: Add a stanza to the configuration file
+       for passing all messages also to user $USER.
+
 2012-10-18  Mats Erik Andersson  <address@hidden>
 
        ftpd: Properly close a user session.
diff --git a/src/syslogd.c b/src/syslogd.c
index f184459..4008967 100644
--- a/src/syslogd.c
+++ b/src/syslogd.c
@@ -1524,7 +1524,7 @@ wallmsg (struct filed *f, struct iovec *iov)
   if (reenter++)
     return;
 
-  read_utmp (PATH_UTMP, &utmp_count, &utmpbuf,
+  read_utmp (UTMP_FILE, &utmp_count, &utmpbuf,
             READ_UTMP_USER_PROCESS | READ_UTMP_CHECK_PIDS);
 
   for (utp = utmpbuf; utp < utmpbuf + utmp_count; utp++)
diff --git a/talkd/process.c b/talkd/process.c
index 4b180f0..7107135 100644
--- a/talkd/process.c
+++ b/talkd/process.c
@@ -186,7 +186,7 @@ find_user (char *name, char *tty)
   status = NOT_HERE;
   strcpy (ftty, PATH_DEV);
 
-  read_utmp (PATH_UTMP, &utmp_count, &utmpbuf,
+  read_utmp (UTMP_FILE, &utmp_count, &utmpbuf,
             READ_UTMP_USER_PROCESS | READ_UTMP_CHECK_PIDS);
 
   for (uptr = utmpbuf; uptr < utmpbuf + utmp_count; uptr++)
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 08f8cb7..c91a485 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -64,6 +64,7 @@ fi
 
 # Portability fix for SVR4
 PWD="${PWD:-`pwd`}"
+USER="${USER:-`id -u -n`}"
 
 $need_mktemp || exit_no_mktemp
 $need_netstat || exit_no_netstat
@@ -314,6 +315,9 @@ cat > "$CONF" <<-EOT
        *.      /dev/null
 EOT
 
+# Add a user recipient in verbose mode.
+$silence false || echo "*.*    $USER" >> "$CONF"
+
 # Set REMOTE_LOGHOST to activate forwarding
 #
 if [ -n "$REMOTE_LOGHOST" ]; then

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |   12 ++++++++++++
 src/syslogd.c    |    2 +-
 talkd/process.c  |    2 +-
 tests/syslogd.sh |    4 ++++
 4 files changed, 18 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU Inetutils