summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--openbsd-compat/bsd-misc.c3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6905defb0..ee5db5b2c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -26,6 +26,9 @@
26 ciphers, since groff has trouble with wide lines; 26 ciphers, since groff has trouble with wide lines;
27 - (djm) [configure.ac umac.c] If platform doesn't provide swap32(3), then 27 - (djm) [configure.ac umac.c] If platform doesn't provide swap32(3), then
28 fallback to provided bit-swizzing functions 28 fallback to provided bit-swizzing functions
29 - (dtucker) [openbsd-compat/bsd-misc.c] According to the spec the "remainder"
30 argument to nanosleep may be NULL. Currently this never happens in OpenSSH,
31 but check anyway in case this changes or the code gets used elsewhere.
29 32
3020070605 3320070605
31 - (dtucker) OpenBSD CVS Sync 34 - (dtucker) OpenBSD CVS Sync
@@ -3001,4 +3004,4 @@
3001 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3004 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3002 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3005 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3003 3006
3004$Id: ChangeLog,v 1.4685 2007/06/11 04:15:42 djm Exp $ 3007$Id: ChangeLog,v 1.4686 2007/06/11 04:34:53 dtucker Exp $
diff --git a/openbsd-compat/bsd-misc.c b/openbsd-compat/bsd-misc.c
index bea3144bd..55f100ac0 100644
--- a/openbsd-compat/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
@@ -158,7 +158,8 @@ int nanosleep(const struct timespec *req, struct timespec *rem)
158 tremain.tv_sec = 0; 158 tremain.tv_sec = 0;
159 tremain.tv_usec = 0; 159 tremain.tv_usec = 0;
160 } 160 }
161 TIMEVAL_TO_TIMESPEC(&tremain, rem) 161 if (rem != NULL)
162 TIMEVAL_TO_TIMESPEC(&tremain, rem)
162 163
163 return(rc); 164 return(rc);
164} 165}