diff options
author | Ryan Zezeski <ryan@zinascii.com> | 2015-01-31 18:54:49 -0500 |
---|---|---|
committer | Richard Lowe <richlowe@richlowe.net> | 2015-02-22 16:16:15 -0500 |
commit | ce3c309f71f6893197099bfac06adb66f0870d7d (patch) | |
tree | fa8fbe40cb99dfa8f860b0d06d3a4e11ce3c6aae /usr/src/lib/libresolv2/common | |
parent | a1cf91d7adb92b3440a7ed1b01e3170ec61e9350 (diff) | |
download | illumos-joyent-ce3c309f71f6893197099bfac06adb66f0870d7d.tar.gz |
872 remove duplicate daemon() definitions
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Marcel Telka <marcel@telka.sk>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/libresolv2/common')
-rw-r--r-- | usr/src/lib/libresolv2/common/bsd/daemon.c | 81 | ||||
-rw-r--r-- | usr/src/lib/libresolv2/common/mapfile-vers | 1 |
2 files changed, 0 insertions, 82 deletions
diff --git a/usr/src/lib/libresolv2/common/bsd/daemon.c b/usr/src/lib/libresolv2/common/bsd/daemon.c deleted file mode 100644 index 54ff83b753..0000000000 --- a/usr/src/lib/libresolv2/common/bsd/daemon.c +++ /dev/null @@ -1,81 +0,0 @@ -#if defined(LIBC_SCCS) && !defined(lint) -static const char sccsid[] = "@(#)daemon.c 8.1 (Berkeley) 6/4/93"; -static const char rcsid[] = "$Id: daemon.c,v 1.2 2005/04/27 04:56:10 sra Exp $"; -#endif /* LIBC_SCCS and not lint */ - -/* - * Copyright (c) 1990, 1993 - * The Regents of the University of California. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include "port_before.h" - -#include <fcntl.h> -#include <paths.h> -#include <unistd.h> - -#include "port_after.h" - -#ifndef NEED_DAEMON -int __bind_daemon__; -#else - -int -daemon(int nochdir, int noclose) { - int fd; - - switch (fork()) { - case -1: - return (-1); - case 0: - break; - default: - _exit(0); - } - - if (setsid() == -1) - return (-1); - - if (!nochdir) - (void)chdir("/"); - - if (!noclose && (fd = open(_PATH_DEVNULL, O_RDWR, 0)) != -1) { - (void)dup2(fd, STDIN_FILENO); - (void)dup2(fd, STDOUT_FILENO); - (void)dup2(fd, STDERR_FILENO); - if (fd > 2) - (void)close (fd); - } - return (0); -} -#endif - -/*! \file */ diff --git a/usr/src/lib/libresolv2/common/mapfile-vers b/usr/src/lib/libresolv2/common/mapfile-vers index a70aac2380..cd2b90ad2c 100644 --- a/usr/src/lib/libresolv2/common/mapfile-vers +++ b/usr/src/lib/libresolv2/common/mapfile-vers @@ -130,7 +130,6 @@ SYMBOL_VERSION SUNWprivate_2.1 { __ctl_sendhelp; __ctl_server; __ctl_setcsctx; - daemon; dn_count_labels; __dn_count_labels; dn_skipname; |