From 77b846adf7d916093105d097575665d08b5321df Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Thu, 26 Feb 2004 05:16:02 +0000 Subject: Move apputils dir from util to lib, to get its proper place in the build process (after include). git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16128 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 4 ++ src/configure.in | 2 +- src/lib/ChangeLog | 5 +++ src/lib/Makefile.in | 4 +- src/lib/apputils/ChangeLog | 6 +++ src/lib/apputils/Makefile.in | 48 +++++++++++++++++++++ src/lib/apputils/configure.in | 6 +++ src/lib/apputils/daemon.c | 95 ++++++++++++++++++++++++++++++++++++++++++ src/lib/apputils/dummy.c | 1 + src/util/ChangeLog | 4 ++ src/util/Makefile.in | 2 +- src/util/apputils/ChangeLog | 6 --- src/util/apputils/Makefile.in | 48 --------------------- src/util/apputils/configure.in | 6 --- src/util/apputils/daemon.c | 95 ------------------------------------------ src/util/apputils/dummy.c | 1 - 16 files changed, 173 insertions(+), 160 deletions(-) create mode 100644 src/lib/apputils/ChangeLog create mode 100644 src/lib/apputils/Makefile.in create mode 100644 src/lib/apputils/configure.in create mode 100644 src/lib/apputils/daemon.c create mode 100644 src/lib/apputils/dummy.c delete mode 100644 src/util/apputils/ChangeLog delete mode 100644 src/util/apputils/Makefile.in delete mode 100644 src/util/apputils/configure.in delete mode 100644 src/util/apputils/daemon.c delete mode 100644 src/util/apputils/dummy.c diff --git a/src/ChangeLog b/src/ChangeLog index b8e1472..5c5edcf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2004-02-25 Ken Raeburn + + * configure.in: Configure lib/apputils, not util/apputils. + 2004-02-24 Ken Raeburn * aclocal.m4 (KRB5_AC_NEED_DAEMON): Don't use AC_REPLACE_FUNCS. diff --git a/src/configure.in b/src/configure.in index 4dc3d68..f2d3f7e 100644 --- a/src/configure.in +++ b/src/configure.in @@ -64,7 +64,7 @@ AC_CONFIG_SUBDIRS(util/profile util/pty) if test "$DB_VERSION" = k5 ; then AC_CONFIG_SUBDIRS(util/db2) fi -AC_CONFIG_SUBDIRS(include lib/crypto lib/krb5 lib/des425 util/apputils) +AC_CONFIG_SUBDIRS(include lib/crypto lib/krb5 lib/des425 lib/apputils) if test -n "$KRB4_LIB"; then AC_CONFIG_SUBDIRS(lib/krb4) fi diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index 2d456bb..f27894c 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,8 @@ +2004-02-26 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Add apputils. + (CLEANLIBS): Add libapputils.a. + 2003-12-18 Jeffrey Altman * krb5_32.def: Remove exports added on 2003-12-13. Moved diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 030beb7..54e20c2 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -1,7 +1,7 @@ thisconfigdir=./.. myfulldir=lib mydir=lib -MY_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5 +MY_SUBDIRS=crypto krb5 des425 @KRB4@ kdb gssapi rpc kadm5 apputils BUILDTOP=$(REL).. MAC_SUBDIRS = crypto krb5 gssapi @@ -12,7 +12,7 @@ all-mac:: CLEANLIBS = libkrb5.a libkdb5.a libcrypto.a libgssapi_krb5.a libdes425.a \ libkrb425.a libkadm.a libkrb4.a libcom_err.a libpty.a \ - libss.a libgssapi.a \ + libss.a libgssapi.a libapputils.a \ libkrb5.so libcrypto.so libkrb4.so libdes425.so clean-mac:: clean-unix diff --git a/src/lib/apputils/ChangeLog b/src/lib/apputils/ChangeLog new file mode 100644 index 0000000..382e1f3 --- /dev/null +++ b/src/lib/apputils/ChangeLog @@ -0,0 +1,6 @@ +2004-02-26 Ken Raeburn + + * New directory. + * Makefile.in, configure.in, dummy.c, daemon.c: Moved here from + util/apputils. + diff --git a/src/lib/apputils/Makefile.in b/src/lib/apputils/Makefile.in new file mode 100644 index 0000000..ec5f94f --- /dev/null +++ b/src/lib/apputils/Makefile.in @@ -0,0 +1,48 @@ +prefix=@prefix@ +bindir=@bindir@ +datadir=@datadir@ +mydatadir=$(datadir)/apputils +thisconfigdir=. +myfulldir=lib/apputils +mydir=. +BUILDTOP=$(REL)..$(S).. +RELDIR=../lib/apputils +SED = sed + +##DOS##BUILDTOP = ..\.. +##DOS##LIBNAME=$(OUTPRE)apputils.lib +##DOS##XTRA= +##DOS##OBJFILE=$(OUTPRE)apputils.lst + +# LIBOBJS may or may not contain daemon.o; dummy.o is just here to +# avoid having an empty library. +STLIBOBJS=dummy.o @LIBOBJS@ +STOBJLISTS=OBJS.ST +LIB=apputils + +all-unix:: all-liblinks +clean-unix:: clean-liblinks clean-libs clean-libobjs +install-unix:: install-libs + +LINTFLAGS=-uhvb +LINTFILES= daemon.c +LIBOBJS=$(OUTPRE)daemon.$(OBJEXT) + +SRCS= $(srcdir)/daemon.c \ + $(srcdir)/dummy.c + +# @lib_frag@ +# @libobj_frag@ + +# +++ Dependency line eater +++ +# +# Makefile dependencies follow. This must be the last section in +# the Makefile.in file +# +daemon.so daemon.po $(OUTPRE)daemon.$(OBJEXT): daemon.c $(SRCTOP)/include/k5-int.h \ + $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ + $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5.h \ + $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ + $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h +dummy.so dummy.po $(OUTPRE)dummy.$(OBJEXT): dummy.c + diff --git a/src/lib/apputils/configure.in b/src/lib/apputils/configure.in new file mode 100644 index 0000000..efc4fcb --- /dev/null +++ b/src/lib/apputils/configure.in @@ -0,0 +1,6 @@ +AC_INIT(daemon.c) +CONFIG_RULES +AC_REPLACE_FUNCS(daemon) +KRB5_BUILD_LIBRARY_STATIC +KRB5_BUILD_LIBOBJS +V5_AC_OUTPUT_MAKEFILE diff --git a/src/lib/apputils/daemon.c b/src/lib/apputils/daemon.c new file mode 100644 index 0000000..00dde48 --- /dev/null +++ b/src/lib/apputils/daemon.c @@ -0,0 +1,95 @@ +/*- + * Copyright (c) 1990 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 "k5-int.h" +#include +#include +#include +#include +#ifdef HAVE_PATHS_H +#include +#endif + +#ifndef _PATH_DEVNULL +#define _PATH_DEVNULL "/dev/null" +#endif + +int +daemon(nochdir, noclose) + int nochdir, noclose; +{ + int cpid; + + if ((cpid = fork()) == -1) + return (-1); + if (cpid) + exit(0); +#ifdef HAVE_SETSID + (void) setsid(); +#else +#ifndef TIOCNOTTY + setpgrp(); +#else + { + int n; + + /* + * The open below may hang on pseudo ttys if the person + * who starts named logs out before this point. Thus, + * the need for the timer. + */ + alarm(120); + n = open("/dev/tty", O_RDWR); + alarm(0); + if (n > 0) { + (void) ioctl(n, TIOCNOTTY, (char *)NULL); + (void) close(n); + } + } +#endif +#endif + if (!nochdir) + (void) chdir("/"); + if (!noclose) { + int devnull = open(_PATH_DEVNULL, O_RDWR, 0); + + if (devnull != -1) { + (void) dup2(devnull, 0); + (void) dup2(devnull, 1); + (void) dup2(devnull, 2); + if (devnull > 2) + (void) close(devnull); + } + } + return (0); +} diff --git a/src/lib/apputils/dummy.c b/src/lib/apputils/dummy.c new file mode 100644 index 0000000..d5b6cc0 --- /dev/null +++ b/src/lib/apputils/dummy.c @@ -0,0 +1 @@ +int lib_server_dummy = 0; diff --git a/src/util/ChangeLog b/src/util/ChangeLog index 7273cf5..84cafbe 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,7 @@ +2004-02-26 Ken Raeburn + + * Makefile.in (MY_SUBDIRS): Drop apputils. + 2004-02-24 Ken Raeburn * Makefile.in (MY_SUBDIRS): Build in apputils dir. diff --git a/src/util/Makefile.in b/src/util/Makefile.in index d04f421..dc5d9dd 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -7,7 +7,7 @@ mydir=util ##WIN32### below in the 'all-windows' target anyways, so just hide this. ##WIN32##!if 0 MY_SUBDIRS=$(MAYBE_ET_@COM_ERR_VERSION@) $(MAYBE_SS_@SS_VERSION@) \ - profile pty $(MAYBE_DB_@DB_VERSION@) send-pr apputils + profile pty $(MAYBE_DB_@DB_VERSION@) send-pr ##WIN32##!endif BUILDTOP=$(REL).. diff --git a/src/util/apputils/ChangeLog b/src/util/apputils/ChangeLog deleted file mode 100644 index 68305d9..0000000 --- a/src/util/apputils/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -2004-02-24 Ken Raeburn - - * New directory. - * Makefile.in, configure.in, dummy.c: New files. - * daemon.c: Moved here from lib/krb5/posix. - diff --git a/src/util/apputils/Makefile.in b/src/util/apputils/Makefile.in deleted file mode 100644 index 20fb80f..0000000 --- a/src/util/apputils/Makefile.in +++ /dev/null @@ -1,48 +0,0 @@ -prefix=@prefix@ -bindir=@bindir@ -datadir=@datadir@ -mydatadir=$(datadir)/apputils -thisconfigdir=. -myfulldir=util/apputils -mydir=. -BUILDTOP=$(REL)..$(S).. -RELDIR=../util/apputils -SED = sed - -##DOS##BUILDTOP = ..\.. -##DOS##LIBNAME=$(OUTPRE)apputils.lib -##DOS##XTRA= -##DOS##OBJFILE=$(OUTPRE)apputils.lst - -# LIBOBJS may or may not contain daemon.o; dummy.o is just here to -# avoid having an empty library. -STLIBOBJS=dummy.o @LIBOBJS@ -STOBJLISTS=OBJS.ST -LIB=apputils - -all-unix:: all-liblinks -clean-unix:: clean-liblinks clean-libs clean-libobjs -install-unix:: install-libs - -LINTFLAGS=-uhvb -LINTFILES= daemon.c -LIBOBJS=$(OUTPRE)daemon.$(OBJEXT) - -SRCS= $(srcdir)/daemon.c \ - $(srcdir)/dummy.c - -# @lib_frag@ -# @libobj_frag@ - -# +++ Dependency line eater +++ -# -# Makefile dependencies follow. This must be the last section in -# the Makefile.in file -# -daemon.so daemon.po $(OUTPRE)daemon.$(OBJEXT): daemon.c $(SRCTOP)/include/k5-int.h \ - $(BUILDTOP)/include/krb5/osconf.h $(BUILDTOP)/include/krb5/autoconf.h \ - $(SRCTOP)/include/k5-platform.h $(BUILDTOP)/include/krb5.h \ - $(COM_ERR_DEPS) $(BUILDTOP)/include/profile.h $(SRCTOP)/include/port-sockets.h \ - $(SRCTOP)/include/socket-utils.h $(SRCTOP)/include/krb5/kdb.h -dummy.so dummy.po $(OUTPRE)dummy.$(OBJEXT): dummy.c - diff --git a/src/util/apputils/configure.in b/src/util/apputils/configure.in deleted file mode 100644 index efc4fcb..0000000 --- a/src/util/apputils/configure.in +++ /dev/null @@ -1,6 +0,0 @@ -AC_INIT(daemon.c) -CONFIG_RULES -AC_REPLACE_FUNCS(daemon) -KRB5_BUILD_LIBRARY_STATIC -KRB5_BUILD_LIBOBJS -V5_AC_OUTPUT_MAKEFILE diff --git a/src/util/apputils/daemon.c b/src/util/apputils/daemon.c deleted file mode 100644 index 00dde48..0000000 --- a/src/util/apputils/daemon.c +++ /dev/null @@ -1,95 +0,0 @@ -/*- - * Copyright (c) 1990 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 "k5-int.h" -#include -#include -#include -#include -#ifdef HAVE_PATHS_H -#include -#endif - -#ifndef _PATH_DEVNULL -#define _PATH_DEVNULL "/dev/null" -#endif - -int -daemon(nochdir, noclose) - int nochdir, noclose; -{ - int cpid; - - if ((cpid = fork()) == -1) - return (-1); - if (cpid) - exit(0); -#ifdef HAVE_SETSID - (void) setsid(); -#else -#ifndef TIOCNOTTY - setpgrp(); -#else - { - int n; - - /* - * The open below may hang on pseudo ttys if the person - * who starts named logs out before this point. Thus, - * the need for the timer. - */ - alarm(120); - n = open("/dev/tty", O_RDWR); - alarm(0); - if (n > 0) { - (void) ioctl(n, TIOCNOTTY, (char *)NULL); - (void) close(n); - } - } -#endif -#endif - if (!nochdir) - (void) chdir("/"); - if (!noclose) { - int devnull = open(_PATH_DEVNULL, O_RDWR, 0); - - if (devnull != -1) { - (void) dup2(devnull, 0); - (void) dup2(devnull, 1); - (void) dup2(devnull, 2); - if (devnull > 2) - (void) close(devnull); - } - } - return (0); -} diff --git a/src/util/apputils/dummy.c b/src/util/apputils/dummy.c deleted file mode 100644 index d5b6cc0..0000000 --- a/src/util/apputils/dummy.c +++ /dev/null @@ -1 +0,0 @@ -int lib_server_dummy = 0; -- cgit v1.1