summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2004-09-12 15:26:00 +1000
committerDamien Miller <djm@mindrot.org>2004-09-12 15:26:00 +1000
commitb0aae333fdecf769da6e693e63d6905713bc0fe6 (patch)
tree9079340599303f79eb8606583e9b2aa2d8d49e7d
parent6b0279c084f93a1e36ad648fd428297cc728cd35 (diff)
downloadopenssh-git-b0aae333fdecf769da6e693e63d6905713bc0fe6.tar.gz
- (djm) [loginrec.c] xmalloc
-rw-r--r--ChangeLog3
-rw-r--r--loginrec.c7
2 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index bddbf611..e1cf4153 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
- (djm) [loginrec.c] Start KNF and tidy up of this long-neglected file.
No change in resultant binary
- (djm) [loginrec.c] __func__ifiy
+ - (djm) [loginrec.c] xmalloc
20040911
- (djm) [ssh-agent.c] unifdef some cygwin code; ok dtucker@
@@ -1739,4 +1740,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3549 2004/09/12 05:25:17 djm Exp $
+$Id: ChangeLog,v 1.3550 2004/09/12 05:26:00 djm Exp $
diff --git a/loginrec.c b/loginrec.c
index e6b70f58..25aa29f2 100644
--- a/loginrec.c
+++ b/loginrec.c
@@ -140,7 +140,7 @@
# include <libutil.h>
#endif
-RCSID("$Id: loginrec.c,v 1.61 2004/09/12 05:25:17 djm Exp $");
+RCSID("$Id: loginrec.c,v 1.62 2004/09/12 05:26:01 djm Exp $");
/**
** prototypes for helper functions in this file
@@ -1353,10 +1353,7 @@ syslogin_perform_login(struct logininfo *li)
{
struct utmp *ut;
- if ((ut = (struct utmp *)malloc(sizeof(*ut))) == NULL) {
- logit("%s: couldn't malloc()", __func__);
- return (0);
- }
+ ut = xmalloc(sizeof(*ut));
construct_utmp(li, ut);
login(ut);
free(ut);