summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--openbsd-compat/port-linux.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b8c334ab0..6230fdc26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
20 of tests for quotes backslashes in sftp-glob.sh. 20 of tests for quotes backslashes in sftp-glob.sh.
21 based on discussion with vinschen AT redhat.com and dtucker@; ok dtucker@ 21 based on discussion with vinschen AT redhat.com and dtucker@; ok dtucker@
22 - (tim) [regress/agent-getpeereid.sh] shell portability fix. 22 - (tim) [regress/agent-getpeereid.sh] shell portability fix.
23 - (dtucker) [openbsd-compat/port-linux.c] Fix minor bug caught by -Werror on
24 the tinderbox.
23 25
2420110116 2620110116
25 - (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based 27 - (dtucker) [Makefile.in configure.ac regress/kextype.sh] Skip sha256-based
diff --git a/openbsd-compat/port-linux.c b/openbsd-compat/port-linux.c
index d89101d18..5b1cf402c 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
1/* $Id: port-linux.c,v 1.10 2011/01/17 00:56:00 dtucker Exp $ */ 1/* $Id: port-linux.c,v 1.11 2011/01/17 07:50:24 dtucker Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com> 4 * Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -266,7 +266,7 @@ oom_adjust_restore(void)
266 FILE *fp; 266 FILE *fp;
267 267
268 debug3("%s", __func__); 268 debug3("%s", __func__);
269 if (oom_adj_save == INT_MIN || oom_adj_save == NULL || 269 if (oom_adj_save == INT_MIN || oom_adj_path == NULL ||
270 (fp = fopen(oom_adj_path, "w")) == NULL) 270 (fp = fopen(oom_adj_path, "w")) == NULL)
271 return; 271 return;
272 272