From 078fda0b90ecc040ea8d4ba2130eb46bc567f480 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Sat, 30 Aug 2003 01:09:41 +0000 Subject: Copy and build daemon.c in whatever directories need it, instead of building it into the krb5 library. * aclocal.m4 (KRB5_AC_NEED_DAEMON): New macro. * appl/bsd/configure.in, kadmin/configure.in, kdc/configure.in, krb524/configure.in, slave/configure.in: Use it. Don't directly check if prototype for daemon() is needed. * kadmin/server/Makefile.in (OBJS), kadmin/v5passwdd/Makefile.in (SERV_OBJS), kdc/Makefile.in (OBJS, fakeka), krb524/Makefile.in (SERVER_OBJS), slave/Makefile.in (SERVEROBJS): Use LIBOBJS. * config/post.in (daemon.c): New rule for copying daemon.c locally from lib/krb5/posix. ticket: 1791 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@15801 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kadmin/ChangeLog | 5 +++++ src/kadmin/configure.in | 5 +---- src/kadmin/server/ChangeLog | 4 ++++ src/kadmin/server/Makefile.in | 2 +- src/kadmin/v5passwdd/ChangeLog | 4 ++++ src/kadmin/v5passwdd/Makefile.in | 2 +- 6 files changed, 16 insertions(+), 6 deletions(-) (limited to 'src/kadmin') diff --git a/src/kadmin/ChangeLog b/src/kadmin/ChangeLog index b16d87642..bd82399af 100644 --- a/src/kadmin/ChangeLog +++ b/src/kadmin/ChangeLog @@ -1,3 +1,8 @@ +2003-08-29 Ken Raeburn + + * configure.in: Call KRB5_AC_NEED_DAEMON instead of checking + whether daemon() prototype is needed. + 2003-01-10 Ken Raeburn * configure.in: Use V5_AC_OUTPUT_MAKEFILE instead of diff --git a/src/kadmin/configure.in b/src/kadmin/configure.in index 48eb0c32a..914129182 100644 --- a/src/kadmin/configure.in +++ b/src/kadmin/configure.in @@ -5,10 +5,7 @@ AC_PROG_YACC AC_PROG_AWK AC_CHECK_HEADERS(unistd.h stdlib.h krb_db.h kdc.h regex.h alloca.h sys/time.h sys/select.h memory.h arpa/inet.h) AC_CHECK_FUNCS(ftime timezone getcwd strstr waitpid vsprintf) -AC_REPLACE_FUNCS([memmove strftime]) -KRB5_NEED_PROTO([#ifdef HAVE_UNISTD_H -#include -#endif],daemon,1) +KRB5_AC_NEED_DAEMON AC_HEADER_TIME CHECK_SIGNALS CHECK_WAIT_TYPE diff --git a/src/kadmin/server/ChangeLog b/src/kadmin/server/ChangeLog index 4a2e37d37..7c363fbcc 100644 --- a/src/kadmin/server/ChangeLog +++ b/src/kadmin/server/ChangeLog @@ -1,3 +1,7 @@ +2003-08-29 Ken Raeburn + + * Makefile.in (OBJS): Use @LIBOBJS@. + 2003-05-27 Tom Yu * schpw.c (process_chpw_request): Log chpw requests. diff --git a/src/kadmin/server/Makefile.in b/src/kadmin/server/Makefile.in index 8a1ee6e39..21e6aab6c 100644 --- a/src/kadmin/server/Makefile.in +++ b/src/kadmin/server/Makefile.in @@ -10,7 +10,7 @@ PROG_LIBPATH=-L$(TOPLIBD) PROG_RPATH=$(KRB5_LIBDIR) PROG = kadmind -OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o server_glue_v1.o +OBJS = kadm_rpc_svc.o server_stubs.o ovsec_kadmd.o schpw.o misc.o server_glue_v1.o @LIBOBJS@ all:: $(PROG) diff --git a/src/kadmin/v5passwdd/ChangeLog b/src/kadmin/v5passwdd/ChangeLog index b301eab76..dc3a7b010 100644 --- a/src/kadmin/v5passwdd/ChangeLog +++ b/src/kadmin/v5passwdd/ChangeLog @@ -1,3 +1,7 @@ +2003-08-29 Ken Raeburn + + * Makefile.in (SERV_OBJS): Use @LIBOBJS@. + 2003-01-09 Ken Raeburn * adm_conn.c (kadm_contact_server): Use socklen_t when passing diff --git a/src/kadmin/v5passwdd/Makefile.in b/src/kadmin/v5passwdd/Makefile.in index 88a122107..c9c7672f8 100644 --- a/src/kadmin/v5passwdd/Makefile.in +++ b/src/kadmin/v5passwdd/Makefile.in @@ -8,7 +8,7 @@ PROG_RPATH=$(KRB5_LIBDIR) COMMON_SRCS = $(srcdir)/adm_rw.c COMMON_OBJS = adm_rw.o SERV_SRCS = $(srcdir)/main.c $(srcdir)/srv_net.c $(srcdir)/proto_serv.c -SERV_OBJS = main.o srv_net.o proto_serv.o +SERV_OBJS = main.o srv_net.o proto_serv.o @LIBOBJS@ CLI_SRCS = $(srcdir)/kpasswd.c $(srcdir)/adm_conn.c CLI_OBJS = kpasswd.o adm_conn.o -- cgit