summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2007-10-26 16:16:09 +1000
committerDamien Miller <djm@mindrot.org>2007-10-26 16:16:09 +1000
commita97529fa2ead2e6fa88de3cc599832cf1e3bc4eb (patch)
treee2a5ef7e1b00e72b58f9112ae0de3572fdd6493b
parent9ed564349195376767bb2ef8cbb502401f0d0dbf (diff)
- (djm) [openbsd-compat/bindresvport.c]
Sync RCS ID after irrelevant (for portable OpenSSH) header shuffling
-rw-r--r--ChangeLog4
-rw-r--r--openbsd-compat/bindresvport.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 36798706b..617074ac2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -86,6 +86,8 @@
86 - (djm) [regress/sftp-cmds.sh] 86 - (djm) [regress/sftp-cmds.sh]
87 Use more restrictive glob to pick up test files from /bin - some platforms 87 Use more restrictive glob to pick up test files from /bin - some platforms
88 ship broken symlinks there which could spoil the test. 88 ship broken symlinks there which could spoil the test.
89 - (djm) [openbsd-compat/bindresvport.c]
90 Sync RCS ID after irrelevant (for portable OpenSSH) header shuffling
89 91
9020070927 9220070927
91 - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if 93 - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if
@@ -3357,4 +3359,4 @@
3357 OpenServer 6 and add osr5bigcrypt support so when someone migrates 3359 OpenServer 6 and add osr5bigcrypt support so when someone migrates
3358 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 3360 passwords between UnixWare and OpenServer they will still work. OK dtucker@
3359 3361
3360$Id: ChangeLog,v 1.4780 2007/10/26 06:14:46 djm Exp $ 3362$Id: ChangeLog,v 1.4781 2007/10/26 06:16:09 djm Exp $
diff --git a/openbsd-compat/bindresvport.c b/openbsd-compat/bindresvport.c
index 65afed1e3..08a53b8cd 100644
--- a/openbsd-compat/bindresvport.c
+++ b/openbsd-compat/bindresvport.c
@@ -1,6 +1,6 @@
1/* This file has be substantially modified from the original OpenBSD source */ 1/* This file has be substantially modified from the original OpenBSD source */
2 2
3/* $OpenBSD: bindresvport.c,v 1.16 2005/04/01 07:44:03 otto Exp $ */ 3/* $OpenBSD: bindresvport.c,v 1.17 2005/12/21 01:40:22 millert Exp $ */
4 4
5/* 5/*
6 * Copyright 1996, Jason Downs. All rights reserved. 6 * Copyright 1996, Jason Downs. All rights reserved.