summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-11-10 17:27:25 +1100
committerDarren Tucker <dtucker@zip.com.au>2005-11-10 17:27:25 +1100
commitb10b49768234f02343c7ae6a95ebc33279d04ea2 (patch)
tree9e996b5bdcbc3c95bf3533f7d0b52ad76414abe5
parent2864039a7ceebbda6fb3e0d99b891c04eb1324bd (diff)
- (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6.
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/daemon.c5
2 files changed, 3 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 22e3a3edc..ab00a5aae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,7 @@
35 - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9. 35 - (dtucker) [openbsd-compat/inet_aton.c] Update from OpenBSD 1.7 -> 1.9.
36 - (dtucker) [openbsd-compat/inet_ntoa.c] Update from OpenBSD 1.4 -> 1.6. 36 - (dtucker) [openbsd-compat/inet_ntoa.c] Update from OpenBSD 1.4 -> 1.6.
37 - (dtucker) [openbsd-compat/inet_ntop.c] Update from OpenBSD 1.5 -> 1.7. 37 - (dtucker) [openbsd-compat/inet_ntop.c] Update from OpenBSD 1.5 -> 1.7.
38 - (dtucker) [openbsd-compat/daemon.c] Update from OpenBSD 1.5 -> 1.6.
38 39
3920051105 4020051105
40 - (djm) OpenBSD CVS Sync 41 - (djm) OpenBSD CVS Sync
@@ -3277,4 +3278,4 @@
3277 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3278 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3278 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3279 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3279 3280
3280$Id: ChangeLog,v 1.3977 2005/11/10 06:25:26 dtucker Exp $ 3281$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 @@
1/* $OpenBSD: daemon.c,v 1.6 2005/08/08 08:05:33 espie Exp $ */
1/*- 2/*-
2 * Copyright (c) 1990, 1993 3 * Copyright (c) 1990, 1993
3 * The Regents of the University of California. All rights reserved. 4 * The Regents of the University of California. All rights reserved.
@@ -33,10 +34,6 @@
33 34
34#ifndef HAVE_DAEMON 35#ifndef HAVE_DAEMON
35 36
36#if defined(LIBC_SCCS) && !defined(lint)
37static char rcsid[] = "$OpenBSD: daemon.c,v 1.5 2003/07/15 17:32:41 deraadt Exp $";
38#endif /* LIBC_SCCS and not lint */
39
40int 37int
41daemon(int nochdir, int noclose) 38daemon(int nochdir, int noclose)
42{ 39{