diff options
author | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 07:27:25 +0100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2005-11-10 07:27:25 +0100 |
commit | b10b49768234f02343c7ae6a95ebc33279d04ea2 (patch) | |
tree | 9e996b5bdcbc3c95bf3533f7d0b52ad76414abe5 | |
parent | - (dtucker) [openbsd-compat/inet_ntop.c] Update from OpenBSD 1.5 -> 1.7. (diff) | |
download | openssh-b10b49768234f02343c7ae6a95ebc33279d04ea2.tar.xz openssh-b10b49768234f02343c7ae6a95ebc33279d04ea2.zip |
- (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6.
-rw-r--r-- | ChangeLog | 3 | ||||
-rw-r--r-- | openbsd-compat/daemon.c | 5 |
2 files changed, 3 insertions, 5 deletions
@@ -35,6 +35,7 @@ - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9. - (dtucker) [openbsd-compat/inet_ntoa.c] Update from OpenBSD 1.4 -> 1.6. - (dtucker) [openbsd-compat/inet_ntop.c] Update from OpenBSD 1.5 -> 1.7. + - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6. 20051105 - (djm) OpenBSD CVS Sync @@ -3277,4 +3278,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.3977 2005/11/10 06:25:26 dtucker Exp $ +$Id: ChangeLog,v 1.3978 2005/11/10 06:27:25 dtucker Exp $ diff --git a/openbsd-compat/daemon.c b/openbsd-compat/daemon.c index 89e75a99e..f8a0680bf 100644 --- a/openbsd-compat/daemon.c +++ b/openbsd-compat/daemon.c @@ -1,3 +1,4 @@ +/* $OpenBSD: daemon.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */ /*- * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. @@ -33,10 +34,6 @@ #ifndef HAVE_DAEMON -#if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$OpenBSD: daemon.c,v 1.5 2003/07/15 17:32:41 deraadt Exp $"; -#endif /* LIBC_SCCS and not lint */ - int daemon(int nochdir, int noclose) { |