summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-08-23 21:53:28 +1000
committerDamien Miller <djm@mindrot.org>2004-08-23 21:53:28 +1000
commitb0419f26d0d75cf1d9b56c26142c5eb7956fef63 (patch)
tree8d694a4d64207d8d71ae2150233b59249f179796
parent7daf044aa2055885da74dc15d56b17c17291c322 (diff)
- (djm) [loginrec.c] Typo and bad args in error messages; Spotted by
Martin.Kraemer AT Fujitsu-Siemens.com
-rw-r--r--ChangeLog4
-rw-r--r--loginrec.c12
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 4564a2433..9bdf55361 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
120040823 120040823
2 - (djm) [ssh-rand-helper.c] Typo. Found by 2 - (djm) [ssh-rand-helper.c] Typo. Found by
3 Martin.Kraemer AT Fujitsu-Siemens.com 3 Martin.Kraemer AT Fujitsu-Siemens.com
4 - (djm) [loginrec.c] Typo and bad args in error messages; Spotted by
5 Martin.Kraemer AT Fujitsu-Siemens.com
4 6
520040817 720040817
6 - (dtucker) [regress/README.regress] Note compatibility issues with GNU head. 8 - (dtucker) [regress/README.regress] Note compatibility issues with GNU head.
@@ -1658,4 +1660,4 @@
1658 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1660 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1659 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1661 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1660 1662
1661$Id: ChangeLog,v 1.3518 2004/08/23 11:52:08 djm Exp $ 1663$Id: ChangeLog,v 1.3519 2004/08/23 11:53:28 djm Exp $
diff --git a/loginrec.c b/loginrec.c
index f07f65fce..3ec378b9a 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -158,7 +158,7 @@
158#include "log.h" 158#include "log.h"
159#include "atomicio.h" 159#include "atomicio.h"
160 160
161RCSID("$Id: loginrec.c,v 1.58 2004/08/15 09:12:52 djm Exp $"); 161RCSID("$Id: loginrec.c,v 1.59 2004/08/23 11:53:28 djm Exp $");
162 162
163#ifdef HAVE_UTIL_H 163#ifdef HAVE_UTIL_H
164# include <util.h> 164# include <util.h>
@@ -832,12 +832,12 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut)
832 832
833 pos = (off_t)tty * sizeof(struct utmp); 833 pos = (off_t)tty * sizeof(struct utmp);
834 if ((ret = lseek(fd, pos, SEEK_SET)) == -1) { 834 if ((ret = lseek(fd, pos, SEEK_SET)) == -1) {
835 logit("%s: llseek: %s", strerror(errno)); 835 logit("%s: lseek: %s", __func__, strerror(errno));
836 return (0); 836 return (0);
837 } 837 }
838 if (ret != pos) { 838 if (ret != pos) {
839 logit("%s: Couldn't seek to tty %s slot in %s", tty, 839 logit("%s: Couldn't seek to tty %d slot in %s",
840 UTMP_FILE); 840 __func__, tty, UTMP_FILE);
841 return (0); 841 return (0);
842 } 842 }
843 /* 843 /*
@@ -853,11 +853,11 @@ utmp_write_direct(struct logininfo *li, struct utmp *ut)
853 } 853 }
854 854
855 if ((ret = lseek(fd, pos, SEEK_SET)) == -1) { 855 if ((ret = lseek(fd, pos, SEEK_SET)) == -1) {
856 logit("%s: llseek: %s", __func__, strerror(errno)); 856 logit("%s: lseek: %s", __func__, strerror(errno));
857 return (0); 857 return (0);
858 } 858 }
859 if (ret != pos) { 859 if (ret != pos) {
860 logit("%s: Couldn't seek to tty %s slot in %s", 860 logit("%s: Couldn't seek to tty %d slot in %s",
861 __func__, tty, UTMP_FILE); 861 __func__, tty, UTMP_FILE);
862 return (0); 862 return (0);
863 } 863 }