summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordtucker <dtucker>2011-01-17 07:50:22 +0000
committerdtucker <dtucker>2011-01-17 07:50:22 +0000
commit25f0cebb09b7bf30eac663169460ca38a2b58eaa (patch)
treea7b860384b8a72d613718006e0b86b188015342f
parentd612a205d3fe71441804041512f1bcfb38bd81d8 (diff)
downloadopenssh-25f0cebb09b7bf30eac663169460ca38a2b58eaa.tar.gz
- (dtucker) [openbsd-compat/port-linux.c] Fix minor bug caught by -Werror on
the tinderbox.
-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 b8c334ab..6230fdc2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
of tests for quotes backslashes in sftp-glob.sh.
based on discussion with vinschen AT redhat.com and dtucker@; ok dtucker@
- (tim) [regress/agent-getpeereid.sh] shell portability fix.
+ - (dtucker) [openbsd-compat/port-linux.c] Fix minor bug caught by -Werror on
+ the tinderbox.
20110116
- (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 d89101d1..5b1cf402 100644
--- a/openbsd-compat/port-linux.c
+++ b/openbsd-compat/port-linux.c
@@ -1,4 +1,4 @@
-/* $Id: port-linux.c,v 1.10 2011/01/17 00:56:00 dtucker Exp $ */
+/* $Id: port-linux.c,v 1.11 2011/01/17 07:50:24 dtucker Exp $ */
/*
* Copyright (c) 2005 Daniel Walsh <dwalsh@redhat.com>
@@ -266,7 +266,7 @@ oom_adjust_restore(void)
FILE *fp;
debug3("%s", __func__);
- if (oom_adj_save == INT_MIN || oom_adj_save == NULL ||
+ if (oom_adj_save == INT_MIN || oom_adj_path == NULL ||
(fp = fopen(oom_adj_path, "w")) == NULL)
return;