diff -u -r --new-file ypbind-mt-1.4/ChangeLog ypbind-mt-1.5/ChangeLog --- ypbind-mt-1.4/ChangeLog Sun Nov 15 12:51:17 1998 +++ ypbind-mt-1.5/ChangeLog Tue May 18 22:19:49 1999 @@ -1,6 +1,30 @@ +1999-05-18 Thorsten Kukuk + + * release version 1.5 + + * man/ypbind.8.in: Update entry of searching new server. + + * src/serv_list.c (test_bindings): Check every 15min. if we have + the fastest NIS server. + +1999-05-03 Thorsten Kukuk + + * src/ypbind-mt.c (create_pidfile): If no locking is available, + don't exit. Hope the user knows what he is doing. + +1999-05-01 Thorsten Kukuk + + * etc/ypbind.init: Change default values for checkconfig. + Patch from Darrell Fuhriman . + +1999-02-28 Thorsten Kukuk + + * src/serv_list.c (find_domain): Print messages only, + if debug flag is set. + 1998-11-11 Thorsten Kukuk - * releaes version 1.4 + * release version 1.4 * lib/clnt_udp.c: Include string.h, add prototype for _rpc_dtablesize. diff -u -r --new-file ypbind-mt-1.4/Makefile.am ypbind-mt-1.5/Makefile.am --- ypbind-mt-1.4/Makefile.am Sun Apr 19 18:19:14 1998 +++ ypbind-mt-1.5/Makefile.am Sun May 2 16:43:36 1999 @@ -1,9 +1,9 @@ # -# Copyright (c) 1998 Thorsten Kukuk, Germany +# Copyright (c) 1998, 1999 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk +# Author: Thorsten Kukuk # -AUTOMAKE_OPTIONS = 1.3 gnits +AUTOMAKE_OPTIONS = 1.4 gnits MAINT_CHARSET = latin1 # SUBDIRS = intl lib src man po diff -u -r --new-file ypbind-mt-1.4/Makefile.in ypbind-mt-1.5/Makefile.in --- ypbind-mt-1.4/Makefile.in Sun Nov 15 12:51:21 1998 +++ ypbind-mt-1.5/Makefile.in Tue May 18 22:20:04 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,13 +11,13 @@ # PARTICULAR PURPOSE. # -# Copyright (c) 1998 Thorsten Kukuk, Germany +# Copyright (c) 1998, 1999 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk +# Author: Thorsten Kukuk # -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -38,7 +38,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +52,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -95,7 +95,7 @@ WARNFLAGS = @WARNFLAGS@ l = @l@ -AUTOMAKE_OPTIONS = 1.3 gnits +AUTOMAKE_OPTIONS = 1.4 gnits MAINT_CHARSET = latin1 # SUBDIRS = intl lib src man po @@ -107,20 +107,19 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = -DIST_COMMON = README ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL \ -Makefile.am Makefile.in NEWS THANKS TODO acconfig.h acinclude.m4 \ -aclocal.m4 config.guess config.h.in config.sub configure configure.in \ -install-sh missing mkinstalldirs stamp-h.in +DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ +INSTALL Makefile.am Makefile.in NEWS THANKS TODO acconfig.h \ +acinclude.m4 aclocal.m4 config.guess config.h.in config.sub configure \ +configure.in install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: all-recursive-am all-am - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -130,22 +129,29 @@ $(ACLOCAL_M4): configure.in acinclude.m4 cd $(srcdir) && $(ACLOCAL) -config.status: $(srcdir)/configure +config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) config.h: stamp-h - @: + @if test ! -f $@; then \ + rm -f stamp-h; \ + $(MAKE) stamp-h; \ + else :; fi stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status cd $(top_builddir) \ && CONFIG_FILES= CONFIG_HEADERS=config.h \ $(SHELL) ./config.status - @echo timestamp > stamp-h + @echo timestamp > stamp-h 2> /dev/null $(srcdir)/config.h.in: $(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi $(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null mostlyclean-hdr: @@ -169,41 +175,65 @@ installdirs-recursive install-recursive uninstall-recursive \ check-recursive installcheck-recursive info-recursive dvi-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" mostlyclean-recursive clean-recursive distclean-recursive \ maintainer-clean-recursive: @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ + test "$$dot_seen" = "no" && rev=". $$rev"; \ + target=`echo $@ | sed s/-recursive//`; \ for subdir in $$rev; do \ - target=`echo $@ | sed s/-recursive//`; \ echo "Making $$target in $$subdir"; \ - (cd $$subdir && $(MAKE) $$target) \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) tags); \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) tags=; \ here=`pwd`; \ list='$(SUBDIRS)'; for subdir in $$list; do \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ done; \ list='$(SOURCES) $(HEADERS)'; \ unique=`for i in $$list; do echo $$i; done | \ @@ -229,29 +259,31 @@ # tarfile. distcheck: dist -rm -rf $(distdir) - GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz + GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz mkdir $(distdir)/=build mkdir $(distdir)/=inst dc_install_base=`cd $(distdir)/=inst && pwd`; \ cd $(distdir)/=build \ && ../configure --with-included-gettext --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) \ - && $(MAKE) dvi \ - && $(MAKE) check \ - && $(MAKE) install \ - && $(MAKE) installcheck \ - && $(MAKE) dist + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) dist -rm -rf $(distdir) - @echo "========================"; \ - echo "$(distdir).tar.gz is ready for distribution"; \ - echo "========================" + @banner="$(distdir).tar.gz is ready for distribution"; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes" dist: distdir -chmod -R a+r $(distdir) - GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) dist-all: distdir -chmod -R a+r $(distdir) - GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir) + GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) -rm -rf $(distdir) distdir: $(DISTFILES) @if sed 15q $(srcdir)/NEWS | fgrep -e "$(VERSION)" > /dev/null; then :; else \ @@ -264,77 +296,83 @@ $(mkinstalldirs) $(distdir)/etc @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done for subdir in $(SUBDIRS); do \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ || exit 1; \ + chmod 777 $(distdir)/$$subdir; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ + || exit 1; \ + fi; \ done +info-am: info: info-recursive +dvi-am: dvi: dvi-recursive -check: all-am - $(MAKE) check-recursive +check-am: all-am +check: check-recursive +installcheck-am: installcheck: installcheck-recursive all-recursive-am: config.h - $(MAKE) all-recursive - -all-am: Makefile config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive +install-exec-am: install-exec: install-exec-recursive - @$(NORMAL_INSTALL) +install-data-am: install-data: install-data-recursive - @$(NORMAL_INSTALL) +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive - @: - +uninstall-am: uninstall: uninstall-recursive - +all-am: Makefile config.h +all-redirect: all-recursive-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive +installdirs-am: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) mostlyclean-am: mostlyclean-hdr mostlyclean-tags mostlyclean-generic -clean-am: clean-hdr clean-tags clean-generic mostlyclean-am - -distclean-am: distclean-hdr distclean-tags distclean-generic clean-am +mostlyclean: mostlyclean-recursive -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ - maintainer-clean-generic distclean-am +clean-am: clean-hdr clean-tags clean-generic mostlyclean-am -mostlyclean: mostlyclean-recursive mostlyclean-am +clean: clean-recursive -clean: clean-recursive clean-am +distclean-am: distclean-hdr distclean-tags distclean-generic clean-am -distclean: distclean-recursive distclean-am +distclean: distclean-recursive -rm -f config.status -maintainer-clean: maintainer-clean-recursive maintainer-clean-am +maintainer-clean-am: maintainer-clean-hdr maintainer-clean-tags \ + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-recursive -rm -f config.status .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ @@ -343,11 +381,12 @@ all-recursive check-recursive installcheck-recursive info-recursive \ dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck all-recursive-am all-am install-exec install-data install \ -uninstall all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs-am \ +installdirs mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r --new-file ypbind-mt-1.4/NEWS ypbind-mt-1.5/NEWS --- ypbind-mt-1.4/NEWS Wed Nov 11 20:45:14 1998 +++ ypbind-mt-1.5/NEWS Tue May 18 22:14:47 1999 @@ -1,10 +1,14 @@ ypbind-mt NEWS -- history of user-visible changes. -Copyright (C) 1998 Thorsten Kukuk +Copyright (C) 1998, 1999 Thorsten Kukuk Please send bug reports, questions and suggestions to -. +. + +Version 1.5 +* Ignore pidfile, if there is no file locking over NFS +* Check all 15 minutes if the current binding is the fastest Version 1.4 * Add fixes for 64bit machines diff -u -r --new-file ypbind-mt-1.4/README ypbind-mt-1.5/README --- ypbind-mt-1.4/README Wed Jul 1 21:50:46 1998 +++ ypbind-mt-1.5/README Sun May 2 16:41:35 1999 @@ -1,5 +1,5 @@ -This directory contains the version 1.3 of the ypbind-mt. +This directory contains the version 1.5 of the ypbind-mt. As of this release, ypbind-mt is known to run on the following @@ -16,7 +16,7 @@ See the file INSTALL to find out how to configure, build, install, and port ypbind-mt. You might also consider reading the WWW pages for Linux NIS (YP) -at http://www-vt.uni-paderborn.de/~kukuk/linux/. +at http://www.suse.de/~kukuk/linux/. ypbind-mt is free software. See the file COPYING for copying conditions. @@ -38,4 +38,4 @@ * Binds to the server which answered as first -Thorsten Kukuk , 1. July 1998 +Thorsten Kukuk , 2. May 1999 diff -u -r --new-file ypbind-mt-1.4/THANKS ypbind-mt-1.5/THANKS --- ypbind-mt-1.4/THANKS Wed Nov 11 20:36:49 1998 +++ ypbind-mt-1.5/THANKS Sun May 2 16:43:51 1999 @@ -1,4 +1,4 @@ -ypbind-mt was originally written by Thorsten Kukuk . +ypbind-mt was originally written by Thorsten Kukuk . It would not be what it is today without the invaluable help of these people: diff -u -r --new-file ypbind-mt-1.4/TODO ypbind-mt-1.5/TODO --- ypbind-mt-1.4/TODO Fri Aug 14 17:49:05 1998 +++ ypbind-mt-1.5/TODO Tue May 18 22:12:49 1999 @@ -1,15 +1,7 @@ Things to do (in no particular order): - * Check all 5-15 min. if the current ypserv is really the - fastest. + * Make time for fastest server check an option (15min. in the moment) * A ypserv host could have multiple interfaces - * Try to reconfigure the host search order for other libraries - then glibc (like Solaris, Linux libc5, Linux libc5+NYS) - * Fix the stupid yp.conf parser - - * Write a better parser for yp.conf - - * Use getopt_long_only for parsing options diff -u -r --new-file ypbind-mt-1.4/acconfig.h ypbind-mt-1.5/acconfig.h --- ypbind-mt-1.4/acconfig.h Sun May 24 10:42:36 1998 +++ ypbind-mt-1.5/acconfig.h Sun May 2 16:42:28 1999 @@ -1,5 +1,5 @@ /* Special definitions, processed by autoheader. - Copyright (C) 1998 Thorsten Kukuk */ + Copyright (C) 1998, 1999 Thorsten Kukuk */ /* Define to the name of the distribution. */ #undef PACKAGE diff -u -r --new-file ypbind-mt-1.4/aclocal.m4 ypbind-mt-1.5/aclocal.m4 --- ypbind-mt-1.4/aclocal.m4 Wed Nov 11 21:01:15 1998 +++ ypbind-mt-1.5/aclocal.m4 Sun May 2 16:47:09 1999 @@ -1,7 +1,7 @@ -dnl aclocal.m4 generated automatically by aclocal 1.3 +dnl aclocal.m4 generated automatically by aclocal 1.4 -dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. -dnl This Makefile.in is free software; the Free Software Foundation +dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -38,7 +38,7 @@ dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AM_PROG_INSTALL]) +[AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -48,8 +48,8 @@ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") -AC_DEFINE_UNQUOTED(VERSION, "$VERSION")) +AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) +AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) AC_REQUIRE([AM_SANITY_CHECK]) AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. @@ -61,15 +61,6 @@ AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# serial 1 - -AC_DEFUN(AM_PROG_INSTALL, -[AC_REQUIRE([AC_PROG_INSTALL]) -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' -AC_SUBST(INSTALL_SCRIPT)dnl -]) - # # Check to make sure that the build environment is sane. # @@ -162,7 +153,8 @@ ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz], [if test "$withval" = yes; then AC_MSG_RESULT(yes) - AC_DEFINE(WITH_DMALLOC) + AC_DEFINE(WITH_DMALLOC,1, + [Define if using the dmalloc debugging malloc package]) LIBS="$LIBS -ldmalloc" LDFLAGS="$LDFLAGS -g" else diff -u -r --new-file ypbind-mt-1.4/config.h.in ypbind-mt-1.5/config.h.in --- ypbind-mt-1.4/config.h.in Wed Jul 1 18:51:03 1998 +++ ypbind-mt-1.5/config.h.in Sun May 2 16:38:57 1999 @@ -43,12 +43,6 @@ /* Define if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to the name of the distribution. */ -#undef PACKAGE - -/* Define to the version of the distribution. */ -#undef VERSION - /* Define if your locale.h file contains LC_MESSAGES. */ #undef HAVE_LC_MESSAGES @@ -67,9 +61,6 @@ /* Define as 1 if defines socklen_t. */ #undef HAVE_SOCKLEN_T -/* Define as 1 if dmalloc should be used. */ -#undef WITH_DMALLOC - /* Define as 1 if efence should be used. */ #undef WITH_EFENCE @@ -183,3 +174,13 @@ /* Define if you have the socket library (-lsocket). */ #undef HAVE_LIBSOCKET + +/* Name of package */ +#undef PACKAGE + +/* Version number of package */ +#undef VERSION + +/* Define if using the dmalloc debugging malloc package */ +#undef WITH_DMALLOC + diff -u -r --new-file ypbind-mt-1.4/configure ypbind-mt-1.5/configure --- ypbind-mt-1.4/configure Wed Nov 11 21:01:18 1998 +++ ypbind-mt-1.5/configure Sun May 2 16:47:12 1999 @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -61,6 +61,7 @@ # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 @@ -344,7 +345,7 @@ verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -514,9 +515,11 @@ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -556,28 +559,30 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:564: checking for a BSD compatible install" >&5 +echo "configure:568: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -607,13 +612,12 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:617: checking whether build environment is sane" >&5 +echo "configure:621: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -670,7 +674,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:674: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:678: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -699,7 +703,7 @@ PACKAGE=ypbind-mt -VERSION=1.4 +VERSION=1.5 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -716,7 +720,7 @@ missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:720: checking for working aclocal" >&5 +echo "configure:724: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -729,7 +733,7 @@ fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:733: checking for working autoconf" >&5 +echo "configure:737: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -742,7 +746,7 @@ fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:746: checking for working automake" >&5 +echo "configure:750: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -755,7 +759,7 @@ fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:759: checking for working autoheader" >&5 +echo "configure:763: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -768,7 +772,7 @@ fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:772: checking for working makeinfo" >&5 +echo "configure:776: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -793,26 +797,26 @@ # Make sure we can run config.sub. -if $ac_config_sub sun4 >/dev/null 2>&1; then : +if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:802: checking host system type" >&5 +echo "configure:806: checking host system type" >&5 host_alias=$host case "$host_alias" in NONE) case $nonopt in NONE) - if host_alias=`$ac_config_guess`; then : + if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } fi ;; *) host_alias=$nonopt ;; esac ;; esac -host=`$ac_config_sub $host_alias` +host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` @@ -824,15 +828,16 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:828: checking for $ac_word" >&5 +echo "configure:832: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -853,16 +858,17 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:857: checking for $ac_word" >&5 +echo "configure:862: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -897,25 +903,61 @@ echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:913: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:905: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:945: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext < conftest.$ac_ext << EOF + +#line 956 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -929,18 +971,24 @@ ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:939: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:987: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:944: checking whether we are using GNU C" >&5 +echo "configure:992: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -949,7 +997,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:953: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -960,11 +1008,15 @@ if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:968: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:1020: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -979,22 +1031,26 @@ fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi test -n "$GCC" && WARNFLAGS="-Wall" echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:998: checking for POSIXized ISC" >&5 +echo "configure:1054: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -1021,28 +1077,30 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1029: checking for a BSD compatible install" >&5 +echo "configure:1086: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -1072,10 +1130,12 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1079: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1139: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1104,15 +1164,16 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1108: checking for $ac_word" >&5 +echo "configure:1168: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" @@ -1132,7 +1193,7 @@ echo $ac_n "checking if malloc debugging is wanted""... $ac_c" 1>&6 -echo "configure:1136: checking if malloc debugging is wanted" >&5 +echo "configure:1197: checking if malloc debugging is wanted" >&5 # Check whether --with-dmalloc or --without-dmalloc was given. if test "${with_dmalloc+set}" = set; then withval="$with_dmalloc" @@ -1153,7 +1214,7 @@ echo $ac_n "checking if malloc debugging with efence is wanted""... $ac_c" 1>&6 -echo "configure:1157: checking if malloc debugging with efence is wanted" >&5 +echo "configure:1218: checking if malloc debugging with efence is wanted" >&5 # Check whether --with-efence or --without-efence was given. if test "${with_efence+set}" = set; then withval="$with_efence" @@ -1176,7 +1237,7 @@ echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6 -echo "configure:1180: checking for yp_get_default_domain in -lnsl" >&5 +echo "configure:1241: checking for yp_get_default_domain in -lnsl" >&5 ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1184,7 +1245,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1223,7 +1284,7 @@ fi echo $ac_n "checking for bind in -lsocket""... $ac_c" 1>&6 -echo "configure:1227: checking for bind in -lsocket" >&5 +echo "configure:1288: checking for bind in -lsocket" >&5 ac_lib_var=`echo socket'_'bind | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1231,7 +1292,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1270,7 +1331,7 @@ fi echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:1274: checking for pthread_create in -lpthread" >&5 +echo "configure:1335: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1278,7 +1339,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1320,12 +1381,12 @@ for ac_func in __nss_configure_lookup do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1324: checking for $ac_func" >&5 +echo "configure:1385: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1374,7 +1435,7 @@ if eval "test \"`echo '$ac_cv_func___nss_configure_lookup'`\" != yes"; then echo $ac_n "checking for res_gethostbyname in -lresolv""... $ac_c" 1>&6 -echo "configure:1378: checking for res_gethostbyname in -lresolv" >&5 +echo "configure:1439: checking for res_gethostbyname in -lresolv" >&5 ac_lib_var=`echo resolv'_'res_gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1382,7 +1443,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1423,12 +1484,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:1427: checking for working const" >&5 +echo "configure:1488: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -1499,16 +1560,16 @@ echo $ac_n "checking wether defiens socklen_t""... $ac_c" 1>&6 -echo "configure:1503: checking wether defiens socklen_t" >&5 +echo "configure:1564: checking wether defiens socklen_t" >&5 cat > conftest.$ac_ext < int main() { socklen_t sock; ; return 0; } EOF -if { (eval echo configure:1512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1573: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* SOCKLEN_T=yes else @@ -1529,7 +1590,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1533: checking how to run the C preprocessor" >&5 +echo "configure:1594: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1544,14 +1605,14 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -1561,14 +1622,31 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:1632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -1581,6 +1659,8 @@ rm -f conftest* fi rm -f conftest* +fi +rm -f conftest* ac_cv_prog_CPP="$CPP" fi CPP="$ac_cv_prog_CPP" @@ -1593,18 +1673,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1597: checking for $ac_hdr" >&5 +echo "configure:1677: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -1633,12 +1713,12 @@ for ac_func in getline getdelim res_gethostbyname _dns_gethostbyname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1637: checking for $ac_func" >&5 +echo "configure:1717: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1687,12 +1767,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1691: checking for ANSI C header files" >&5 +echo "configure:1771: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1700,8 +1780,8 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* ac_cv_header_stdc=yes @@ -1717,7 +1797,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1735,7 +1815,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -1756,7 +1836,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1767,7 +1847,7 @@ exit (0); } EOF -if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1791,21 +1871,21 @@ fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1795: checking for inline" >&5 +echo "configure:1875: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1889: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1831,12 +1911,12 @@ esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:1835: checking for off_t" >&5 +echo "configure:1915: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1845,7 +1925,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_off_t=yes else @@ -1864,12 +1944,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:1868: checking for size_t" >&5 +echo "configure:1948: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -1878,7 +1958,7 @@ #endif EOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then + egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then rm -rf conftest* ac_cv_type_size_t=yes else @@ -1899,19 +1979,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1903: checking for working alloca.h" >&5 +echo "configure:1983: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1932,25 +2012,30 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1936: checking for alloca" >&5 +echo "configure:2016: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < +# ifdef _MSC_VER +# include +# define alloca _alloca # else -# ifdef _AIX - #pragma alloca +# if HAVE_ALLOCA_H +# include # else -# ifndef alloca /* predefined by HP cc +Olibcalls */ +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca /* predefined by HP cc +Olibcalls */ char *alloca (); +# endif # endif # endif # endif @@ -1960,7 +2045,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:1964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -1985,19 +2070,19 @@ # that cause trouble. Some versions do not even contain alloca or # contain a buggy version. If you still want to use their alloca, # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.o + ALLOCA=alloca.${ac_objext} cat >> confdefs.h <<\EOF #define C_ALLOCA 1 EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:1996: checking whether alloca needs Cray hooks" >&5 +echo "configure:2081: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:2026: checking for $ac_func" >&5 +echo "configure:2111: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2077,7 +2162,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2081: checking stack direction for C alloca" >&5 +echo "configure:2166: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2085,7 +2170,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2129,18 +2214,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2133: checking for $ac_hdr" >&5 +echo "configure:2218: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2168,12 +2253,12 @@ for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2172: checking for $ac_func" >&5 +echo "configure:2257: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2221,7 +2306,7 @@ done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2225: checking for working mmap" >&5 +echo "configure:2310: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2229,7 +2314,7 @@ ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2397,18 +2482,18 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2401: checking for $ac_hdr" >&5 +echo "configure:2486: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2437,12 +2522,12 @@ strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2441: checking for $ac_func" >&5 +echo "configure:2526: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2494,12 +2579,12 @@ for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2498: checking for $ac_func" >&5 +echo "configure:2583: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2556,19 +2641,19 @@ if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:2560: checking for LC_MESSAGES" >&5 +echo "configure:2645: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:2572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -2589,7 +2674,7 @@ fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:2593: checking whether NLS is requested" >&5 +echo "configure:2678: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -2609,7 +2694,7 @@ EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:2613: checking whether included gettext is requested" >&5 +echo "configure:2698: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -2628,18 +2713,18 @@ ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:2632: checking for libintl.h" >&5 +echo "configure:2717: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:2727: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -2655,19 +2740,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:2659: checking for gettext in libc" >&5 +echo "configure:2744: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:2671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -2683,7 +2768,7 @@ if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:2687: checking for bindtextdomain in -lintl" >&5 +echo "configure:2772: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2691,7 +2776,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2718,12 +2803,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:2722: checking for gettext in libintl" >&5 +echo "configure:2807: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:2727: checking for gettext in -lintl" >&5 +echo "configure:2812: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2731,7 +2816,7 @@ ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2781,7 +2866,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2785: checking for $ac_word" >&5 +echo "configure:2870: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2815,12 +2900,12 @@ for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2819: checking for $ac_func" >&5 +echo "configure:2904: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2870,7 +2955,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2874: checking for $ac_word" >&5 +echo "configure:2959: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2878,9 +2963,13 @@ /*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" @@ -2902,7 +2991,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2906: checking for $ac_word" >&5 +echo "configure:2995: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2934,7 +3023,7 @@ fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -2965,7 +3054,7 @@ if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:2969: checking whether catgets can be used" >&5 +echo "configure:3058: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -2978,7 +3067,7 @@ if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:2982: checking for main in -li" >&5 +echo "configure:3071: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2986,14 +3075,14 @@ ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3021,12 +3110,12 @@ fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:3025: checking for catgets" >&5 +echo "configure:3114: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -3071,7 +3160,7 @@ # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3075: checking for $ac_word" >&5 +echo "configure:3164: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3079,9 +3168,13 @@ /*) ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GENCAT="$GENCAT" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GENCAT="$ac_dir/$ac_word" @@ -3103,7 +3196,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3107: checking for $ac_word" >&5 +echo "configure:3200: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3111,9 +3204,13 @@ /*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" @@ -3136,7 +3233,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3140: checking for $ac_word" >&5 +echo "configure:3237: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3171,7 +3268,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3175: checking for $ac_word" >&5 +echo "configure:3272: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3229,7 +3326,7 @@ # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3233: checking for $ac_word" >&5 +echo "configure:3330: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3263,7 +3360,7 @@ # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3267: checking for $ac_word" >&5 +echo "configure:3364: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3271,9 +3368,13 @@ /*) ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. ;; + ?:/*) + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path. + ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_path_GMSGFMT="$ac_dir/$ac_word" @@ -3295,7 +3396,7 @@ # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3299: checking for $ac_word" >&5 +echo "configure:3400: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3388,7 +3489,7 @@ LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:3392: checking for catalogs to be installed" >&5 +echo "configure:3493: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -3416,18 +3517,18 @@ if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:3420: checking for linux/version.h" >&5 +echo "configure:3521: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3430: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:3531: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -3498,9 +3599,9 @@ linux-gnu) USE_BROADCAST=1 echo $ac_n "checking wether we have glibc 2.1 or later""... $ac_c" 1>&6 -echo "configure:3502: checking wether we have glibc 2.1 or later" >&5 +echo "configure:3603: checking wether we have glibc 2.1 or later" >&5 cat > conftest.$ac_ext < int main() { @@ -3511,7 +3612,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* CLNTUDPSRC=yes else @@ -3529,7 +3630,7 @@ fi echo $ac_n "checking kernel version""... $ac_c" 1>&6 -echo "configure:3533: checking kernel version" >&5 +echo "configure:3634: checking kernel version" >&5 case `uname -r 2>&1` in 0.* | 1.* | 2.0.* | 2.1.[0-9] | 2.1.[0-8]? ) kernel_is_recent="has thread/file locking bug" @@ -3566,7 +3667,7 @@ echo "***" echo "*** ypbind-mt is currently not tested on this platform." echo "*** I don't know if it will work. If it works, please send" - echo "*** an email to and tell me" + echo "*** an email to and tell me" echo "*** that this program will work on the platform" echo "*** "$host_cpu-$host_vendor-$host_os", so that I could add it." echo "***" @@ -3604,7 +3705,7 @@ # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -3671,7 +3772,7 @@ echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -3692,9 +3793,11 @@ s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -3714,8 +3817,8 @@ s%@infodir@%$infodir%g s%@mandir@%$mandir%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_DATA@%$INSTALL_DATA%g s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g +s%@INSTALL_DATA@%$INSTALL_DATA%g s%@PACKAGE@%$PACKAGE%g s%@VERSION@%$VERSION%g s%@ACLOCAL@%$ACLOCAL%g diff -u -r --new-file ypbind-mt-1.4/configure.in ypbind-mt-1.5/configure.in --- ypbind-mt-1.4/configure.in Wed Nov 11 21:01:14 1998 +++ ypbind-mt-1.5/configure.in Sun May 2 16:42:03 1999 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/ypbind-mt.c) -AM_INIT_AUTOMAKE(ypbind-mt, 1.4) +AM_INIT_AUTOMAKE(ypbind-mt, 1.5) AM_CONFIG_HEADER(config.h) AC_PREFIX_DEFAULT(/usr) @@ -130,7 +130,7 @@ echo "***" echo "*** ypbind-mt is currently not tested on this platform." echo "*** I don't know if it will work. If it works, please send" - echo "*** an email to and tell me" + echo "*** an email to and tell me" echo "*** that this program will work on the platform" echo "*** "$host_cpu-$host_vendor-$host_os", so that I could add it." echo "***" diff -u -r --new-file ypbind-mt-1.4/etc/ypbind.init ypbind-mt-1.5/etc/ypbind.init --- ypbind-mt-1.4/etc/ypbind.init Sun Jun 7 12:55:52 1998 +++ ypbind-mt-1.5/etc/ypbind.init Sat May 1 19:05:44 1999 @@ -4,7 +4,7 @@ # # Version: @(#) /etc/rc.d/init.d/ypbind.init 1.0 # -# chkconfig: - 70 30 +# chkconfig: - 13 87 # description: This is a daemon which runs on NIS/YP clients and binds them \ # to a NIS domain. It must be running for systems based on glibc \ # to work as NIS clients, but it should not be enabled on systems \ diff -u -r --new-file ypbind-mt-1.4/lib/Makefile.am ypbind-mt-1.5/lib/Makefile.am --- ypbind-mt-1.4/lib/Makefile.am Sun Apr 19 18:17:33 1998 +++ ypbind-mt-1.5/lib/Makefile.am Fri May 14 20:59:55 1999 @@ -1,11 +1,11 @@ # -# Copyright (c) 1998 Thorsten Kukuk, Germany +# Copyright (c) 1998, 1999 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk +# Author: Thorsten Kukuk # # Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = 1.3 gnits +AUTOMAKE_OPTIONS = 1.4 gnits noinst_LIBRARIES = libcompat.a diff -u -r --new-file ypbind-mt-1.4/lib/Makefile.in ypbind-mt-1.5/lib/Makefile.in --- ypbind-mt-1.4/lib/Makefile.in Sun Nov 15 12:51:23 1998 +++ ypbind-mt-1.5/lib/Makefile.in Tue May 18 22:20:07 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,14 +11,14 @@ # PARTICULAR PURPOSE. # -# Copyright (c) 1998 Thorsten Kukuk, Germany +# Copyright (c) 1998, 1999 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk +# Author: Thorsten Kukuk # # Process this file with automake to produce Makefile.in. -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -39,7 +39,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -53,7 +53,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -96,7 +96,7 @@ WARNFLAGS = @WARNFLAGS@ l = @l@ -AUTOMAKE_OPTIONS = 1.3 gnits +AUTOMAKE_OPTIONS = 1.4 gnits noinst_LIBRARIES = libcompat.a @@ -124,23 +124,23 @@ libcompat_a_DEPENDENCIES = @LIBOBJS@ libcompat_a_OBJECTS = dns_hosts.o AR = ar -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in clnt_udp.c DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(libcompat_a_SOURCES) OBJECTS = $(libcompat_a_OBJECTS) -all: Makefile $(LIBRARIES) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps lib/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -184,8 +184,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -213,71 +217,84 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -dns_hosts.o: dns_hosts.c ../config.h - -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: +uninstall: uninstall-am +all-am: Makefile $(LIBRARIES) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-noinstLIBRARIES mostlyclean-compile \ +mostlyclean-am: mostlyclean-noinstLIBRARIES mostlyclean-compile \ mostlyclean-tags mostlyclean-generic -clean: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ - mostlyclean +mostlyclean: mostlyclean-am + +clean-am: clean-noinstLIBRARIES clean-compile clean-tags clean-generic \ + mostlyclean-am -distclean: distclean-noinstLIBRARIES distclean-compile distclean-tags \ - distclean-generic clean - -rm -f config.status +clean: clean-am -maintainer-clean: maintainer-clean-noinstLIBRARIES \ +distclean-am: distclean-noinstLIBRARIES distclean-compile \ + distclean-tags distclean-generic clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-noinstLIBRARIES \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \ clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile tags mostlyclean-tags distclean-tags \ -clean-tags maintainer-clean-tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ +check-am installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -u -r --new-file ypbind-mt-1.4/lib/dns_hosts.c ypbind-mt-1.5/lib/dns_hosts.c --- ypbind-mt-1.4/lib/dns_hosts.c Tue Mar 31 18:55:26 1998 +++ ypbind-mt-1.5/lib/dns_hosts.c Sun Feb 28 21:27:58 1999 @@ -57,7 +57,7 @@ */ #ifndef LINT -static const char rcsid[] = "$Id: dns_hosts.c,v 1.2 1997/05/02 16:34:14 kukuk Exp $"; +static const char rcsid[] = "$Id: dns_hosts.c,v 1.1.1.1 1999/02/28 20:27:58 kukuk Exp $"; #endif #if defined(HAVE_CONFIG_H) diff -u -r --new-file ypbind-mt-1.4/man/Makefile.am ypbind-mt-1.5/man/Makefile.am --- ypbind-mt-1.4/man/Makefile.am Sun Apr 19 18:17:51 1998 +++ ypbind-mt-1.5/man/Makefile.am Fri May 14 21:00:56 1999 @@ -1,7 +1,7 @@ # -# Copyright (c) 1997, 1998 Thorsten Kukuk, Germany +# Copyright (c) 1997, 1998, 1999 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk +# Author: Thorsten Kukuk # AUTOMAKE_OPTIONS = 1.3 gnits diff -u -r --new-file ypbind-mt-1.4/man/Makefile.in ypbind-mt-1.5/man/Makefile.in --- ypbind-mt-1.4/man/Makefile.in Sun Nov 15 12:51:27 1998 +++ ypbind-mt-1.5/man/Makefile.in Tue May 18 22:20:12 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,13 +11,13 @@ # PARTICULAR PURPOSE. # -# Copyright (c) 1997, 1998 Thorsten Kukuk, Germany +# Copyright (c) 1997, 1998, 1999 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk +# Author: Thorsten Kukuk # -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -38,7 +38,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,7 +52,7 @@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ transform = @program_transform_name@ @@ -116,11 +116,10 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best -all: Makefile $(MANS) - +GZIP_ENV = --best +all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps man/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -128,7 +127,7 @@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status sedscript: $(top_builddir)/config.status sedscript.in - cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status + cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status install-man5: $(mkinstalldirs) $(DESTDIR)$(man5dir) @@ -197,10 +196,10 @@ done install-man: $(MANS) @$(NORMAL_INSTALL) - $(MAKE) install-man5 install-man8 + $(MAKE) $(AM_MAKEFLAGS) install-man5 install-man8 uninstall-man: @$(NORMAL_UNINSTALL) - $(MAKE) uninstall-man5 uninstall-man8 + $(MAKE) $(AM_MAKEFLAGS) uninstall-man5 uninstall-man8 tags: TAGS TAGS: @@ -212,62 +211,76 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: - @$(NORMAL_INSTALL) - -install-data: install-man - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-man - +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: +install-exec: install-exec-am + +install-data-am: install-man +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-man +uninstall: uninstall-am +all-am: Makefile $(MANS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: $(mkinstalldirs) $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8 mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-generic +mostlyclean-am: mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-generic mostlyclean-am -clean: clean-generic mostlyclean +clean: clean-am -distclean: distclean-generic clean - -rm -f config.status +distclean-am: distclean-generic clean-am -maintainer-clean: maintainer-clean-generic distclean +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: install-man5 uninstall-man5 install-man8 uninstall-man8 \ -install-man uninstall-man tags distdir info dvi installcheck \ -install-exec install-data install uninstall all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean +install-man uninstall-man tags distdir info-am info dvi-am dvi check \ +check-am installcheck-am installcheck install-exec-am install-exec \ +install-data-am install-data install-am install uninstall-am uninstall \ +all-redirect all-am all installdirs mostlyclean-generic \ +distclean-generic clean-generic maintainer-clean-generic clean \ +mostlyclean distclean maintainer-clean ypbind.8: ypbind.8.in sedscript diff -u -r --new-file ypbind-mt-1.4/man/yp.conf.5.in ypbind-mt-1.5/man/yp.conf.5.in --- ypbind-mt-1.4/man/yp.conf.5.in Sun Apr 19 17:12:48 1998 +++ ypbind-mt-1.5/man/yp.conf.5.in Fri May 14 21:00:33 1999 @@ -1,10 +1,8 @@ .\" -*- nroff -*- -.\" Copyright 1998 Thorsten Kukuk +.\" Copyright 1998, 1999 Thorsten Kukuk .\" .\" This file is part of ypbind-mt. .\" -.\" Author: Thorsten Kukuk -.\" .\" ypbind-mt is free software; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License as .\" published by the Free Software Foundation; either version 2 of the @@ -64,4 +62,4 @@ .BR ypbind (8) .SH AUTHOR .B ypbind-mt -was written by Thorsten Kukuk . +was written by Thorsten Kukuk . diff -u -r --new-file ypbind-mt-1.4/man/ypbind.8.in ypbind-mt-1.5/man/ypbind.8.in --- ypbind-mt-1.4/man/ypbind.8.in Wed Jul 1 21:50:01 1998 +++ ypbind-mt-1.5/man/ypbind.8.in Tue May 18 22:19:11 1999 @@ -1,9 +1,9 @@ .\" -*- nroff -*- -.\" Copyright 1998 Thorsten Kukuk +.\" Copyright 1998, 1999 Thorsten Kukuk, Germany .\" .\" This file is part of ypbind-mt. .\" -.\" Author: Thorsten Kukuk +.\" Author: Thorsten Kukuk .\" .\" ypbind-mt is free software; you can redistribute it and/or .\" modify it under the terms of the GNU General Public License as @@ -20,7 +20,7 @@ .\" write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, .\" Boston, MA 02111-1307, USA. .\" -.TH ypbind 8 "July 1998" "ypbind-mt Version @PK_VERSION@" +.TH ypbind 8 "May 1999" "ypbind-mt Version @PK_VERSION@" .SH NAME ypbind - NIS binding process .SH SYNOPSIS @@ -69,7 +69,11 @@ intervals. If it doesn't get an response or the NIS server tells that he doesn't has this domain any longer, .B ypbind -will search a new NIS server. You could tell +will search a new NIS server. All 15 minutes +.B ypbind +will check, if the current NIS server is the fastest. If it find +a server which answers faster, it will switch to this server. +You could tell .B ypbind to use network broadcasts to find a new server, what is insecure, or you could give it a list of known, secure servers. @@ -264,4 +268,4 @@ .SH AUTHOR .B ypbind-mt -was written by Thorsten Kukuk . +was written by Thorsten Kukuk . diff -u -r --new-file ypbind-mt-1.4/mkinstalldirs ypbind-mt-1.5/mkinstalldirs --- ypbind-mt-1.4/mkinstalldirs Thu Feb 5 15:02:54 1998 +++ ypbind-mt-1.5/mkinstalldirs Sun Feb 28 21:27:57 1999 @@ -4,7 +4,7 @@ # Created: 1993-05-16 # Public domain -# $Id: mkinstalldirs,v 1.1 1997/11/27 19:39:11 kukuk Exp $ +# $Id: mkinstalldirs,v 1.1.1.1 1999/02/28 20:27:57 kukuk Exp $ errstatus=0 diff -u -r --new-file ypbind-mt-1.4/po/cat-id-tbl.c ypbind-mt-1.5/po/cat-id-tbl.c --- ypbind-mt-1.4/po/cat-id-tbl.c Wed Jul 1 22:17:05 1998 +++ ypbind-mt-1.5/po/cat-id-tbl.c Tue May 18 22:12:49 1999 @@ -27,57 +27,58 @@ {"clnt_create for server '%s' (domain '%s') failed", 18}, {"domain '%s' not served by '%s'", 19}, {"Pinging all active server.", 20}, - {"Server for domain '%s' doesn't answer.", 21}, - {"Server '%s' for domain '%s' doesn't answer.", 22}, - {"Trying entry: %s", 23}, - {"parsed domain '%s' server '%s'", 24}, - {"parsed domain '%s' broadcast", 25}, - {"parsed ypserver %s", 26}, - {"Entry \"%s\" is not valid, ignore it !", 27}, - {"No entry found.", 28}, - {"cannot create pidfile %s", 29}, - {"fcntl error", 30}, - {"ypbind-mt already running (pid %d) - exiting", 31}, - {"cannot lock pidfile", 32}, - {"SIGCHLD arrived, what should I do ?", 33}, - {"Signal (%d) for quitting program arrived.", 34}, - {"cannot unlock pidfile", 35}, - {"SIGHUP arrived, reloading config file.", 36}, - {"Unknown signal: %d", 37}, - {"Usage:\n", 38}, + {"Check new for fastest server.", 21}, + {"Server for domain '%s' doesn't answer.", 22}, + {"Server '%s' for domain '%s' doesn't answer.", 23}, + {"Trying entry: %s", 24}, + {"parsed domain '%s' server '%s'", 25}, + {"parsed domain '%s' broadcast", 26}, + {"parsed ypserver %s", 27}, + {"Entry \"%s\" is not valid, ignore it !", 28}, + {"No entry found.", 29}, + {"cannot create pidfile %s", 30}, + {"fcntl error: %s", 31}, + {"ypbind-mt already running (pid %d) - exiting", 32}, + {"cannot lock pidfile", 33}, + {"SIGCHLD arrived, what should I do ?", 34}, + {"Signal (%d) for quitting program arrived.", 35}, + {"cannot unlock pidfile", 36}, + {"SIGHUP arrived, reloading config file.", 37}, + {"Unknown signal: %d", 38}, + {"Usage:\n", 39}, {"\ \typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n\ -\t [-no_ping] [-broken_server] [-debug]\n", 39}, - {"\typbind -c [-f configfile]\n", 40}, - {"\typbind --version\n", 41}, - {"Config file %s is ok.\n", 42}, - {"domainname not set - aborting.\n", 43}, - {"ypbind must be run as root\n", 44}, - {"Could not create %s: %s\n", 45}, - {"Could not change to directory %s: %s\n", 46}, - {"No NIS server and no -broadcast option specified.\n", 47}, - {"Add a NIS server to the %s configuration file,\n", 48}, - {"or start ypbind with the -broadcast option.\n", 49}, - {"Could not block signals.", 50}, - {"Cannot create UDP: %s", 51}, - {"Cannot bind UDP: %s", 52}, - {"Cannot create udp service.", 53}, - {"Unable to register (YPBINDPROG, YPBINDVERS, udp).", 54}, - {"Unable to register (YPBINDPROG, YPBINDOLDVERS, udp).", 55}, - {"Cannot create TCP: %s", 56}, - {"Cannot bind TCP: %s", 57}, - {"Cannot create tcp service.\n", 58}, - {"Unable to register (YPBINDPROG, YPBINDVERS, tcp).", 59}, - {"Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp).", 60}, - {"svc_run returned.", 61}, - {"Domain name '%s' has embedded slash -- rejecting.", 62}, - {"Status: YPBIND_FAIL_VAL", 63}, - {"Status: YPBIND_SUCC_VAL", 64}, - {"User from '%s' try's to change the binding.", 65}, - {"Changing the binding is not allowed.", 66}, - {"SETDOM request doesn't come from reserved port.", 67}, - {"unable to free arguments", 68}, - {"unable to free results", 69}, +\t [-no_ping] [-broken_server] [-debug]\n", 40}, + {"\typbind -c [-f configfile]\n", 41}, + {"\typbind --version\n", 42}, + {"Config file %s is ok.\n", 43}, + {"domainname not set - aborting.\n", 44}, + {"ypbind must be run as root\n", 45}, + {"Could not create %s: %s\n", 46}, + {"Could not change to directory %s: %s\n", 47}, + {"No NIS server and no -broadcast option specified.\n", 48}, + {"Add a NIS server to the %s configuration file,\n", 49}, + {"or start ypbind with the -broadcast option.\n", 50}, + {"Could not block signals.", 51}, + {"Cannot create UDP: %s", 52}, + {"Cannot bind UDP: %s", 53}, + {"Cannot create udp service.", 54}, + {"Unable to register (YPBINDPROG, YPBINDVERS, udp).", 55}, + {"Unable to register (YPBINDPROG, YPBINDOLDVERS, udp).", 56}, + {"Cannot create TCP: %s", 57}, + {"Cannot bind TCP: %s", 58}, + {"Cannot create tcp service.\n", 59}, + {"Unable to register (YPBINDPROG, YPBINDVERS, tcp).", 60}, + {"Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp).", 61}, + {"svc_run returned.", 62}, + {"Domain name '%s' has embedded slash -- rejecting.", 63}, + {"Status: YPBIND_FAIL_VAL", 64}, + {"Status: YPBIND_SUCC_VAL", 65}, + {"User from '%s' try's to change the binding.", 66}, + {"Changing the binding is not allowed.", 67}, + {"SETDOM request doesn't come from reserved port.", 68}, + {"unable to free arguments", 69}, + {"unable to free results", 70}, }; -int _msg_tbl_length = 69; +int _msg_tbl_length = 70; Binary files ypbind-mt-1.4/po/de.gmo and ypbind-mt-1.5/po/de.gmo differ diff -u -r --new-file ypbind-mt-1.4/po/de.po ypbind-mt-1.5/po/de.po --- ypbind-mt-1.4/po/de.po Wed Jul 1 19:05:33 1998 +++ ypbind-mt-1.5/po/de.po Tue May 18 22:20:12 1999 @@ -1,126 +1,116 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"PO-Revision-Date: 1998-07-01 19:05+02:00\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" - # German translation for ypbind-mt. -# Copyright (C) 1998 Thorsten Kukuk -# Thorsten Kukuk , 1998. +# Copyright (C) 1998, 1999 Thorsten Kukuk +# Thorsten Kukuk , 1998. # msgid "" msgstr "" "Project-Id-Version: ypbind-mt\n" -"POT-Creation-Date: 1998-04-17 21:19+0200\n" +"POT-Creation-Date: 1999-05-18 19:01+0200\n" "PO-Revision-Date: 1998-04-01 22:26+02:00\n" -"Last-Translator: Thorsten Kukuk \n" +"Last-Translator: Thorsten Kukuk \n" "Language-Team: No Language-Team\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/serv_list.c:312 +#: src/serv_list.c:347 msgid "Not enough memory !" msgstr "Nicht genug Arbeitsspeicher !" -#: src/serv_list.c:336 +#: src/serv_list.c:371 msgid "internal error: add_server called with NULL domain." -msgstr "Interner Fehler: add_server wurde mit NULL pointer für domain aufgerufen." +msgstr "" +"Interner Fehler: add_server wurde mit NULL pointer für domain aufgerufen." -#: src/serv_list.c:350 +#: src/serv_list.c:385 #, c-format msgid "add_server() domain: %s, broadcast, slot: 0" msgstr "add_server() Domain: %s, Broadcast, Slot: 0" -#: src/serv_list.c:366 +#: src/serv_list.c:401 #, c-format msgid "add_server() domain: %s, host: %s, %sbroadcast, slot: %d" msgstr "add_server() Domain: %s, Host: %s, %sBroadcast, Slot: %d" -#: src/serv_list.c:367 +#: src/serv_list.c:402 msgid "unknown" msgstr "unbekannt" -#: src/serv_list.c:368 +#: src/serv_list.c:403 msgid "no" msgstr "kein " -#: src/serv_list.c:408 +#: src/serv_list.c:443 #, c-format msgid "Unknown host: %s" msgstr "Unbekannter Rechner: %s" -#: src/serv_list.c:412 +#: src/serv_list.c:447 msgid "Host name lookup failure" msgstr "Hostname lookup Fehler" -#: src/serv_list.c:415 +#: src/serv_list.c:450 #, c-format msgid "No address associated with name: %s" msgstr "Keine Addresse vorhanden für Rechner: %s" -#: src/serv_list.c:419 +#: src/serv_list.c:454 msgid "Unknown server error" msgstr "Unbekanter Server Fehler" -#: src/serv_list.c:422 +#: src/serv_list.c:457 msgid "gethostbyname: Unknown error" msgstr "gethostbyname: Unbekannter Fehler" -#: src/serv_list.c:488 src/serv_list.c:747 +#: src/serv_list.c:527 src/serv_list.c:787 #, c-format msgid "Answer for domain '%s' from server '%s'" msgstr "Antwort für Domain \"%s\" vom Server \"%s\"" -#: src/serv_list.c:492 +#: src/serv_list.c:531 #, c-format msgid "Answer for domain '%s' from unknown server '%s'" msgstr "Antwort für Domain \"%s\" von unbekantem Server \"%s\"" -#: src/serv_list.c:498 +#: src/serv_list.c:537 #, c-format msgid "Answer for domain '%s' from '%s' on illegal port." msgstr "Antwort für Domain \"%s\" vom Server \"%s\" vom illegalen Port." -#: src/serv_list.c:661 src/serv_list.c:788 +#: src/serv_list.c:700 src/serv_list.c:828 #, c-format msgid "ping host '%s', domain '%s'" msgstr "Ping Host \"%s\", Domain \"%s\"" -#: src/serv_list.c:673 +#: src/serv_list.c:712 #, c-format msgid "host '%s' doesn't answer." msgstr "Server \"%s\" antwortet nicht." -#: src/serv_list.c:809 +#: src/serv_list.c:849 #, c-format msgid "clnt_create for server '%s' (domain '%s') failed" msgstr "clnt_create für server \"%s\" (domain \"%s\") schlug fehl" -#: src/serv_list.c:830 +#: src/serv_list.c:870 #, c-format msgid "domain '%s' not served by '%s'" msgstr "Domain \"%s\" wird nicht von \"%s\" unterstützt" -#: src/serv_list.c:896 +#: src/serv_list.c:949 msgid "Pinging all active server." msgstr "Sende ein Ping zu allen aktiven Servern." -#: src/serv_list.c:919 +#: src/serv_list.c:951 +msgid "Check new for fastest server." +msgstr "" + +#: src/serv_list.c:979 #, c-format msgid "Server for domain '%s' doesn't answer." msgstr "Server für Domain \"%s\" antwortet nicht." -#: src/serv_list.c:925 src/serv_list.c:930 +#: src/serv_list.c:985 src/serv_list.c:990 #, c-format msgid "Server '%s' for domain '%s' doesn't answer." msgstr "Server \"%s\" für Domain \"%s\" antwortet nicht." @@ -135,179 +125,200 @@ msgid "parsed domain '%s' server '%s'" msgstr "" -#: src/ypbind-mt.c:186 +#: src/ypbind-mt.c:187 #, c-format msgid "parsed domain '%s' broadcast" msgstr "" -#: src/ypbind-mt.c:202 +#: src/ypbind-mt.c:204 #, c-format msgid "parsed ypserver %s" msgstr "" -#: src/ypbind-mt.c:217 +#: src/ypbind-mt.c:211 +#, c-format +msgid "Entry \"%s\" is not valid, ignore it !" +msgstr "" + +#: src/ypbind-mt.c:221 msgid "No entry found." msgstr "Keinen Eintrag gefunden." -#: src/ypbind-mt.c:238 +#: src/ypbind-mt.c:242 #, c-format msgid "cannot create pidfile %s" msgstr "Kann Pidfile %s nicht erzeugen." -#: src/ypbind-mt.c:263 -msgid "fcntl error" +#: src/ypbind-mt.c:270 +#, fuzzy, c-format +msgid "fcntl error: %s" msgstr "fcntl Fehler" -#: src/ypbind-mt.c:272 +#: src/ypbind-mt.c:282 #, c-format msgid "ypbind-mt already running (pid %d) - exiting" msgstr "ypbind-mt läuft bereits (pid %d) - beende mich" -#: src/ypbind-mt.c:283 +#: src/ypbind-mt.c:293 msgid "cannot lock pidfile" msgstr "Kann Pidfile nicht locken" -#: src/ypbind-mt.c:325 +#: src/ypbind-mt.c:335 msgid "SIGCHLD arrived, what should I do ?" msgstr "SIGCHLD abgefangen, was soll ich machen ?" -#: src/ypbind-mt.c:333 +#: src/ypbind-mt.c:343 #, c-format msgid "Signal (%d) for quitting program arrived." msgstr "Signal (%d) zum beenden des Programms bekommen." -#: src/ypbind-mt.c:344 +#: src/ypbind-mt.c:354 msgid "cannot unlock pidfile" msgstr "Kann Pidfile nicht unlocken." -#: src/ypbind-mt.c:354 +#: src/ypbind-mt.c:364 msgid "SIGHUP arrived, reloading config file." msgstr "SIGHUP abgefangen, Config Datei wird neu geladen." -#: src/ypbind-mt.c:366 +#: src/ypbind-mt.c:376 #, c-format msgid "Unknown signal: %d" msgstr "Unbekanntes Signal: %d" -#: src/ypbind-mt.c:375 +#: src/ypbind-mt.c:385 msgid "Usage:\n" msgstr "Aufruf:\n" -#: src/ypbind-mt.c:376 +#: src/ypbind-mt.c:386 +#, fuzzy msgid "" -"\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile] " -"[-no_ping] [-broken_server] [-debug]\n" +"\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n" +"\t [-no_ping] [-broken_server] [-debug]\n" msgstr "" " ypbind [-broadcast | -ypset | -ypsetme] [-p Port] [-f configfile] " "[-no_ping] [-broken_server] [-debug]\n" -#: src/ypbind-mt.c:377 +#: src/ypbind-mt.c:387 +msgid "\typbind -c [-f configfile]\n" +msgstr "" + +#: src/ypbind-mt.c:388 msgid "\typbind --version\n" msgstr "" -#: src/ypbind-mt.c:436 +#: src/ypbind-mt.c:455 +#, c-format +msgid "Config file %s is ok.\n" +msgstr "" + +#: src/ypbind-mt.c:463 msgid "domainname not set - aborting.\n" msgstr "Domainname wurde nicht gesetzt - Abbruch.\n" -#: src/ypbind-mt.c:442 +#: src/ypbind-mt.c:469 msgid "ypbind must be run as root\n" msgstr "ypbind muß als root gestartet werden.\n" -#: src/ypbind-mt.c:453 -#, c-format -msgid "Could not create %s: %s" +#: src/ypbind-mt.c:477 src/ypbind-mt.c:486 +#, fuzzy, c-format +msgid "Could not create %s: %s\n" +msgstr "Kann %s nicht erzeugen: %s" + +#: src/ypbind-mt.c:493 +#, fuzzy, c-format +msgid "Could not change to directory %s: %s\n" msgstr "Kann %s nicht erzeugen: %s" -#: src/ypbind-mt.c:464 +#: src/ypbind-mt.c:502 msgid "No NIS server and no -broadcast option specified.\n" msgstr "Es wurde kein NIS server und keine -broadcast Option angegeben.\n" -#: src/ypbind-mt.c:466 +#: src/ypbind-mt.c:504 #, c-format msgid "Add a NIS server to the %s configuration file,\n" msgstr "Füge einen NIS server in die %s Configurations Datei hinzu,\n" -#: src/ypbind-mt.c:468 +#: src/ypbind-mt.c:506 msgid "or start ypbind with the -broadcast option.\n" msgstr "oder starte ypbind mit der -broadcast Option.\n" -#: src/ypbind-mt.c:513 +#: src/ypbind-mt.c:551 msgid "Could not block signals." msgstr "Kann die Signale nicht blocken." -#: src/ypbind-mt.c:527 +#: src/ypbind-mt.c:565 #, c-format msgid "Cannot create UDP: %s" msgstr "Kann UDP Socket nicht erzeugen: %s" -#: src/ypbind-mt.c:540 +#: src/ypbind-mt.c:578 #, c-format msgid "Cannot bind UDP: %s" msgstr "" -#: src/ypbind-mt.c:550 +#: src/ypbind-mt.c:588 msgid "Cannot create udp service." msgstr "Kann UDP Servie nicht erzeugen." -#: src/ypbind-mt.c:558 +#: src/ypbind-mt.c:596 msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)." msgstr "Kann (YPBINDPROG, YPBINDVERS, upd) nicht beim portmapper registrieren." -#: src/ypbind-mt.c:566 +#: src/ypbind-mt.c:604 msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)." msgstr "" "Kann (YPBINDPROG, YPBINDOLDVERS, udp) nicht beim portmapper registrieren." -#: src/ypbind-mt.c:575 +#: src/ypbind-mt.c:613 #, c-format msgid "Cannot create TCP: %s" msgstr "Kann TCP Socket nicht erzeugen: %s" -#: src/ypbind-mt.c:588 +#: src/ypbind-mt.c:626 #, c-format msgid "Cannot bind TCP: %s" msgstr "" -#: src/ypbind-mt.c:598 +#: src/ypbind-mt.c:636 msgid "Cannot create tcp service.\n" msgstr "Kann TCP Service nicht erzeugen.\n" -#: src/ypbind-mt.c:605 +#: src/ypbind-mt.c:643 msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)." msgstr "Kann (YPBINDPROG, YPBINDVERS, tcp) nicht beim portmapper registrieren." -#: src/ypbind-mt.c:613 +#: src/ypbind-mt.c:651 msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)." msgstr "" "Kann (YPBINDPROG, YPBINDOLDVERS, tcp) nicht beim portmapper registrieren." -#: src/ypbind-mt.c:620 +#: src/ypbind-mt.c:658 msgid "svc_run returned." msgstr "" -#: src/ypbind_server.c:65 src/ypbind_server.c:107 +#: src/ypbind_server.c:65 src/ypbind_server.c:108 #, c-format msgid "Domain name '%s' has embedded slash -- rejecting." msgstr "Domainname \"%s\" enthält einen Schrägstrich -- zurückgewiesen." -#: src/ypbind_server.c:74 +#: src/ypbind_server.c:75 msgid "Status: YPBIND_FAIL_VAL" msgstr "Status: YPBIND_FAIL_VAL" -#: src/ypbind_server.c:76 +#: src/ypbind_server.c:77 msgid "Status: YPBIND_SUCC_VAL" msgstr "Status: YPBIND_SUCC_VAL" -#: src/ypbind_server.c:119 +#: src/ypbind_server.c:120 #, c-format msgid "User from '%s' try's to change the binding." msgstr "User vom host \"%s\" versucht das Binding to ändern." -#: src/ypbind_server.c:128 +#: src/ypbind_server.c:129 msgid "Changing the binding is not allowed." msgstr "Das ändern des Bindings ist nicht erlaubt." -#: src/ypbind_server.c:133 +#: src/ypbind_server.c:134 msgid "SETDOM request doesn't come from reserved port." msgstr "Der SETDOM Request kam nicht von einem reservierten Port." diff -u -r --new-file ypbind-mt-1.4/po/ypbind-mt.pot ypbind-mt-1.5/po/ypbind-mt.pot --- ypbind-mt-1.4/po/ypbind-mt.pot Wed Nov 11 21:00:26 1998 +++ ypbind-mt-1.5/po/ypbind-mt.pot Tue May 18 22:12:49 1999 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-11-11 21:00+0100\n" +"POT-Creation-Date: 1999-05-18 19:01+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,275 +14,280 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: ENCODING\n" -#: src/serv_list.c:346 +#: src/serv_list.c:347 msgid "Not enough memory !" msgstr "" -#: src/serv_list.c:370 +#: src/serv_list.c:371 msgid "internal error: add_server called with NULL domain." msgstr "" -#: src/serv_list.c:384 +#: src/serv_list.c:385 #, c-format msgid "add_server() domain: %s, broadcast, slot: 0" msgstr "" -#: src/serv_list.c:400 +#: src/serv_list.c:401 #, c-format msgid "add_server() domain: %s, host: %s, %sbroadcast, slot: %d" msgstr "" -#: src/serv_list.c:401 +#: src/serv_list.c:402 msgid "unknown" msgstr "" -#: src/serv_list.c:402 +#: src/serv_list.c:403 msgid "no" msgstr "" -#: src/serv_list.c:442 +#: src/serv_list.c:443 #, c-format msgid "Unknown host: %s" msgstr "" -#: src/serv_list.c:446 +#: src/serv_list.c:447 msgid "Host name lookup failure" msgstr "" -#: src/serv_list.c:449 +#: src/serv_list.c:450 #, c-format msgid "No address associated with name: %s" msgstr "" -#: src/serv_list.c:453 +#: src/serv_list.c:454 msgid "Unknown server error" msgstr "" -#: src/serv_list.c:456 +#: src/serv_list.c:457 msgid "gethostbyname: Unknown error" msgstr "" -#: src/serv_list.c:524 src/serv_list.c:783 +#: src/serv_list.c:527 src/serv_list.c:787 #, c-format msgid "Answer for domain '%s' from server '%s'" msgstr "" -#: src/serv_list.c:528 +#: src/serv_list.c:531 #, c-format msgid "Answer for domain '%s' from unknown server '%s'" msgstr "" -#: src/serv_list.c:534 +#: src/serv_list.c:537 #, c-format msgid "Answer for domain '%s' from '%s' on illegal port." msgstr "" -#: src/serv_list.c:697 src/serv_list.c:824 +#: src/serv_list.c:700 src/serv_list.c:828 #, c-format msgid "ping host '%s', domain '%s'" msgstr "" -#: src/serv_list.c:709 +#: src/serv_list.c:712 #, c-format msgid "host '%s' doesn't answer." msgstr "" -#: src/serv_list.c:845 +#: src/serv_list.c:849 #, c-format msgid "clnt_create for server '%s' (domain '%s') failed" msgstr "" -#: src/serv_list.c:866 +#: src/serv_list.c:870 #, c-format msgid "domain '%s' not served by '%s'" msgstr "" -#: src/serv_list.c:934 +#: src/serv_list.c:949 msgid "Pinging all active server." msgstr "" -#: src/serv_list.c:958 +#: src/serv_list.c:951 +msgid "Check new for fastest server." +msgstr "" + +#: src/serv_list.c:979 #, c-format msgid "Server for domain '%s' doesn't answer." msgstr "" -#: src/serv_list.c:964 src/serv_list.c:969 +#: src/serv_list.c:985 src/serv_list.c:990 #, c-format msgid "Server '%s' for domain '%s' doesn't answer." msgstr "" -#: src/ypbind-mt.c:160 +#: src/ypbind-mt.c:162 #, c-format msgid "Trying entry: %s" msgstr "" -#: src/ypbind-mt.c:174 +#: src/ypbind-mt.c:176 #, c-format msgid "parsed domain '%s' server '%s'" msgstr "" -#: src/ypbind-mt.c:185 +#: src/ypbind-mt.c:187 #, c-format msgid "parsed domain '%s' broadcast" msgstr "" -#: src/ypbind-mt.c:202 +#: src/ypbind-mt.c:204 #, c-format msgid "parsed ypserver %s" msgstr "" -#: src/ypbind-mt.c:209 +#: src/ypbind-mt.c:211 #, c-format msgid "Entry \"%s\" is not valid, ignore it !" msgstr "" -#: src/ypbind-mt.c:219 +#: src/ypbind-mt.c:221 msgid "No entry found." msgstr "" -#: src/ypbind-mt.c:240 +#: src/ypbind-mt.c:242 #, c-format msgid "cannot create pidfile %s" msgstr "" -#: src/ypbind-mt.c:265 -msgid "fcntl error" +#: src/ypbind-mt.c:270 +#, c-format +msgid "fcntl error: %s" msgstr "" -#: src/ypbind-mt.c:274 +#: src/ypbind-mt.c:282 #, c-format msgid "ypbind-mt already running (pid %d) - exiting" msgstr "" -#: src/ypbind-mt.c:285 +#: src/ypbind-mt.c:293 msgid "cannot lock pidfile" msgstr "" -#: src/ypbind-mt.c:327 +#: src/ypbind-mt.c:335 msgid "SIGCHLD arrived, what should I do ?" msgstr "" -#: src/ypbind-mt.c:335 +#: src/ypbind-mt.c:343 #, c-format msgid "Signal (%d) for quitting program arrived." msgstr "" -#: src/ypbind-mt.c:346 +#: src/ypbind-mt.c:354 msgid "cannot unlock pidfile" msgstr "" -#: src/ypbind-mt.c:356 +#: src/ypbind-mt.c:364 msgid "SIGHUP arrived, reloading config file." msgstr "" -#: src/ypbind-mt.c:368 +#: src/ypbind-mt.c:376 #, c-format msgid "Unknown signal: %d" msgstr "" -#: src/ypbind-mt.c:377 +#: src/ypbind-mt.c:385 msgid "Usage:\n" msgstr "" -#: src/ypbind-mt.c:378 +#: src/ypbind-mt.c:386 msgid "" "\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n" "\t [-no_ping] [-broken_server] [-debug]\n" msgstr "" -#: src/ypbind-mt.c:379 +#: src/ypbind-mt.c:387 msgid "\typbind -c [-f configfile]\n" msgstr "" -#: src/ypbind-mt.c:380 +#: src/ypbind-mt.c:388 msgid "\typbind --version\n" msgstr "" -#: src/ypbind-mt.c:447 +#: src/ypbind-mt.c:455 #, c-format msgid "Config file %s is ok.\n" msgstr "" -#: src/ypbind-mt.c:455 +#: src/ypbind-mt.c:463 msgid "domainname not set - aborting.\n" msgstr "" -#: src/ypbind-mt.c:461 +#: src/ypbind-mt.c:469 msgid "ypbind must be run as root\n" msgstr "" -#: src/ypbind-mt.c:469 src/ypbind-mt.c:478 +#: src/ypbind-mt.c:477 src/ypbind-mt.c:486 #, c-format msgid "Could not create %s: %s\n" msgstr "" -#: src/ypbind-mt.c:485 +#: src/ypbind-mt.c:493 #, c-format msgid "Could not change to directory %s: %s\n" msgstr "" -#: src/ypbind-mt.c:494 +#: src/ypbind-mt.c:502 msgid "No NIS server and no -broadcast option specified.\n" msgstr "" -#: src/ypbind-mt.c:496 +#: src/ypbind-mt.c:504 #, c-format msgid "Add a NIS server to the %s configuration file,\n" msgstr "" -#: src/ypbind-mt.c:498 +#: src/ypbind-mt.c:506 msgid "or start ypbind with the -broadcast option.\n" msgstr "" -#: src/ypbind-mt.c:543 +#: src/ypbind-mt.c:551 msgid "Could not block signals." msgstr "" -#: src/ypbind-mt.c:557 +#: src/ypbind-mt.c:565 #, c-format msgid "Cannot create UDP: %s" msgstr "" -#: src/ypbind-mt.c:570 +#: src/ypbind-mt.c:578 #, c-format msgid "Cannot bind UDP: %s" msgstr "" -#: src/ypbind-mt.c:580 +#: src/ypbind-mt.c:588 msgid "Cannot create udp service." msgstr "" -#: src/ypbind-mt.c:588 +#: src/ypbind-mt.c:596 msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)." msgstr "" -#: src/ypbind-mt.c:596 +#: src/ypbind-mt.c:604 msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)." msgstr "" -#: src/ypbind-mt.c:605 +#: src/ypbind-mt.c:613 #, c-format msgid "Cannot create TCP: %s" msgstr "" -#: src/ypbind-mt.c:618 +#: src/ypbind-mt.c:626 #, c-format msgid "Cannot bind TCP: %s" msgstr "" -#: src/ypbind-mt.c:628 +#: src/ypbind-mt.c:636 msgid "Cannot create tcp service.\n" msgstr "" -#: src/ypbind-mt.c:635 +#: src/ypbind-mt.c:643 msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)." msgstr "" -#: src/ypbind-mt.c:643 +#: src/ypbind-mt.c:651 msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)." msgstr "" -#: src/ypbind-mt.c:650 +#: src/ypbind-mt.c:658 msgid "svc_run returned." msgstr "" diff -u -r --new-file ypbind-mt-1.4/src/Makefile.am ypbind-mt-1.5/src/Makefile.am --- ypbind-mt-1.4/src/Makefile.am Sun Apr 19 18:18:15 1998 +++ ypbind-mt-1.5/src/Makefile.am Fri May 14 21:02:35 1999 @@ -1,10 +1,10 @@ # -# Copyright (c) 1998 Thorsten Kukuk, Germany +# Copyright (c) 1998, 1999 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk +# Author: Thorsten Kukuk # -AUTOMAKE_OPTIONS = 1.3 gnits +AUTOMAKE_OPTIONS = 1.4 gnits INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555 diff -u -r --new-file ypbind-mt-1.4/src/Makefile.in ypbind-mt-1.5/src/Makefile.in --- ypbind-mt-1.4/src/Makefile.in Sun Nov 15 12:51:26 1998 +++ ypbind-mt-1.5/src/Makefile.in Tue May 18 22:20:10 1999 @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.3 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,13 +11,13 @@ # PARTICULAR PURPOSE. # -# Copyright (c) 1998 Thorsten Kukuk, Germany +# Copyright (c) 1998, 1999 Thorsten Kukuk, Germany # -# Author: Thorsten Kukuk +# Author: Thorsten Kukuk # -SHELL = /bin/sh +SHELL = @SHELL@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ @@ -38,7 +38,7 @@ includedir = @includedir@ oldincludedir = /usr/include -DISTDIR = +DESTDIR = pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -94,12 +94,12 @@ WARNFLAGS = @WARNFLAGS@ l = @l@ -AUTOMAKE_OPTIONS = 1.3 gnits +AUTOMAKE_OPTIONS = 1.4 gnits INSTALL_PROGRAM = @INSTALL_PROGRAM@ -s -m 555 -CFLAGS = -D_REENTRANT=1 @WARNFLAGS@ @DEFS@ @CFLAGS@ \ - -DUSE_PIDFILE=@USE_PIDFILE@ -DUSE_BROADCAST=@USE_BROADCAST@ +CFLAGS = -D_REENTRANT=1 @WARNFLAGS@ @DEFS@ @CFLAGS@ -DUSE_PIDFILE=@USE_PIDFILE@ -DUSE_BROADCAST=@USE_BROADCAST@ + LDADD = ../lib/libcompat.a @INTLLIBS@ localedir = $(datadir)/locale @@ -109,9 +109,8 @@ sbin_PROGRAMS = ypbind -ypbind_SOURCES = ypbind.h ypbind-mt.c ypbind_xdr.c ypbind_svc.c \ - ypbind_server.c log_msg.c log_msg.h local.h serv_list.c \ - pthread_np.c pthread_np.h +ypbind_SOURCES = ypbind.h ypbind-mt.c ypbind_xdr.c ypbind_svc.c ypbind_server.c log_msg.c log_msg.h local.h serv_list.c pthread_np.c pthread_np.h + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -127,23 +126,23 @@ ypbind_LDADD = $(LDADD) ypbind_DEPENDENCIES = ../lib/libcompat.a ypbind_LDFLAGS = -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ DIST_COMMON = Makefile.am Makefile.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) TAR = tar -GZIP = --best +GZIP_ENV = --best SOURCES = $(ypbind_SOURCES) OBJECTS = $(ypbind_OBJECTS) -all: Makefile $(PROGRAMS) - +all: all-redirect .SUFFIXES: .SUFFIXES: .S .c .o .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnits --include-deps src/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -165,15 +164,15 @@ $(mkinstalldirs) $(DESTDIR)$(sbindir) @list='$(sbin_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ - echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \ + echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ else :; fi; \ done uninstall-sbinPROGRAMS: @$(NORMAL_UNINSTALL) list='$(sbin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed '$(transform)'`; \ + rm -f $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ done .c.o: @@ -202,8 +201,12 @@ tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP) + && mkid -f$$here/ID $$unique $(LISP) TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) tags=; \ @@ -231,78 +234,84 @@ distdir: $(DISTFILES) @for file in $(DISTFILES); do \ d=$(srcdir); \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file; \ + if test -d $$d/$$file; then \ + cp -pr $$/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ done -log_msg.o: log_msg.c log_msg.h -pthread_np.o: pthread_np.c pthread_np.h -serv_list.o: serv_list.c ../config.h ypbind.h log_msg.h local.h \ - pthread_np.h -ypbind-mt.o: ypbind-mt.c ../config.h ypbind.h log_msg.h local.h -ypbind_server.o: ypbind_server.c ../config.h ypbind.h log_msg.h local.h -ypbind_svc.o: ypbind_svc.c ../config.h ypbind.h log_msg.h local.h -ypbind_xdr.o: ypbind_xdr.c ypbind.h - -info: -dvi: -check: all - $(MAKE) -installcheck: -install-exec: install-sbinPROGRAMS - @$(NORMAL_INSTALL) - -install-data: - @$(NORMAL_INSTALL) - -install: install-exec install-data all - @: - -uninstall: uninstall-sbinPROGRAMS +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +install-exec-am: install-sbinPROGRAMS +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-sbinPROGRAMS +uninstall: uninstall-am +all-am: Makefile $(PROGRAMS) +all-redirect: all-am install-strip: - $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DATADIR)$(sbindir) + $(mkinstalldirs) $(DESTDIR)$(sbindir) mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: - -rm -f Makefile $(DISTCLEANFILES) + -rm -f Makefile $(CONFIG_CLEAN_FILES) -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) maintainer-clean-generic: - -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean: mostlyclean-sbinPROGRAMS mostlyclean-compile \ +mostlyclean-am: mostlyclean-sbinPROGRAMS mostlyclean-compile \ mostlyclean-tags mostlyclean-generic -clean: clean-sbinPROGRAMS clean-compile clean-tags clean-generic \ - mostlyclean +mostlyclean: mostlyclean-am -distclean: distclean-sbinPROGRAMS distclean-compile distclean-tags \ - distclean-generic clean - -rm -f config.status +clean-am: clean-sbinPROGRAMS clean-compile clean-tags clean-generic \ + mostlyclean-am -maintainer-clean: maintainer-clean-sbinPROGRAMS \ +clean: clean-am + +distclean-am: distclean-sbinPROGRAMS distclean-compile distclean-tags \ + distclean-generic clean-am + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-sbinPROGRAMS \ maintainer-clean-compile maintainer-clean-tags \ - maintainer-clean-generic distclean + maintainer-clean-generic distclean-am @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." +maintainer-clean: maintainer-clean-am + .PHONY: mostlyclean-sbinPROGRAMS distclean-sbinPROGRAMS \ clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \ install-sbinPROGRAMS mostlyclean-compile distclean-compile \ clean-compile maintainer-clean-compile tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info dvi \ -installcheck install-exec install-data install uninstall all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ +dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean diff -u -r --new-file ypbind-mt-1.4/src/pthread_np.c ypbind-mt-1.5/src/pthread_np.c --- ypbind-mt-1.4/src/pthread_np.c Sat Feb 21 17:29:47 1998 +++ ypbind-mt-1.5/src/pthread_np.c Fri May 14 21:04:12 1999 @@ -1,8 +1,8 @@ -/* Copyright (c) 1998 Thorsten Kukuk +/* Copyright (c) 1998, 1999 Thorsten Kukuk, Germany This file is part of ypbind-mt. - Author: Thorsten Kukuk + Author: Thorsten Kukuk The ypbind-mt are free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -u -r --new-file ypbind-mt-1.4/src/pthread_np.h ypbind-mt-1.5/src/pthread_np.h --- ypbind-mt-1.4/src/pthread_np.h Thu Feb 26 23:51:39 1998 +++ ypbind-mt-1.5/src/pthread_np.h Fri May 14 21:04:36 1999 @@ -1,8 +1,8 @@ -/* Copyright (c) 1998 Thorsten Kukuk +/* Copyright (c) 1998, 1999 Thorsten Kukuk, Germany This file is part of ypbind-mt. - Author: Thorsten Kukuk + Author: Thorsten Kukuk The ypbind-mt are free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -u -r --new-file ypbind-mt-1.4/src/serv_list.c ypbind-mt-1.5/src/serv_list.c --- ypbind-mt-1.4/src/serv_list.c Wed Nov 11 20:59:46 1998 +++ ypbind-mt-1.5/src/serv_list.c Tue May 18 22:12:49 1999 @@ -1,8 +1,8 @@ -/* Copyright (c) 1998 Thorsten Kukuk +/* Copyright (c) 1998, 1999 Thorsten Kukuk This file is part of ypbind-mt. - Author: Thorsten Kukuk + Author: Thorsten Kukuk The ypbind-mt are free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -199,7 +199,8 @@ pthread_rdwr_runlock_np (&domainlock); if (pthread_mutex_trylock (&search_lock) == 0) { - log_msg (LOG_DEBUG, "trylock = success"); + if (debug_flag) + log_msg (LOG_DEBUG, "trylock = success"); if (domainlist[i].use_broadcast) do_broadcast (&domainlist[i]); else @@ -461,7 +462,9 @@ if (hent->h_addr_list[0] == NULL) return; entry->server[active].family = hent->h_addrtype; - /* XXX host could have multiple interfaces */ + /* XXX host could have multiple interfaces. We should + try to use the interface on the local network. + If there is none, use the first one. */ memcpy (&entry->server[active].addr, hent->h_addr_list[0], hent->h_length); } @@ -773,7 +776,8 @@ bind->client_handle = clntudp_create (&(pings[i]->sin), YPPROG, YPVERS, TIMEOUT50, &sock); - /* XXX Missing NULL check here */ + /* XXX Missing NULL check here. But should not + happen, we have got an answer from the server. */ pthread_rdwr_wunlock_np (&domainlock); pthread_rdwr_rlock_np (&domainlock); update_bindingfile (bind); @@ -917,7 +921,7 @@ test_bindings (void *param) { static int success = 0; - int i; + int i, lastcheck = 0; do_binding (); @@ -928,10 +932,24 @@ { sleep (ping_interval); + /* Check, if ping_interval was changed through a SIGHUP. + Not possible in the moment, but maybe in the future. */ + if (ping_interval < 1) + pthread_exit (&success); + + lastcheck += ping_interval; + if (lastcheck >= 900) /* 900 = 15min. */ + lastcheck = 0; + pthread_rdwr_rlock_np (&domainlock); if (debug_flag) - log_msg (LOG_DEBUG, _("Pinging all active server.")); + { + if (lastcheck) + log_msg (LOG_DEBUG, _("Pinging all active server.")); + else + log_msg (LOG_DEBUG, _("Check new for fastest server.")); + } for (i = 0; i < max_domains; ++i) { @@ -942,16 +960,19 @@ if (domainlist[i].active != -1) { - timeout.tv_sec = 3; - timeout.tv_usec = 0; - status = - clnt_call(domainlist[i].client_handle, - YPPROC_DOMAIN, (xdrproc_t) ypbind_xdr_domainname, - (caddr_t) &domain, (xdrproc_t) xdr_bool, (caddr_t) &out, - timeout); - if (status != RPC_SUCCESS || out != TRUE) + if (lastcheck) { - if (debug_flag) + timeout.tv_sec = 3; + timeout.tv_usec = 0; + status = + clnt_call(domainlist[i].client_handle, + YPPROC_DOMAIN, (xdrproc_t) ypbind_xdr_domainname, + (caddr_t) &domain, (xdrproc_t) xdr_bool, + (caddr_t) &out, timeout); + } + if (lastcheck == 0 || status != RPC_SUCCESS || out != TRUE) + { + if (debug_flag && lastcheck) { if (domainlist[i].use_broadcast) log_msg (LOG_DEBUG, @@ -971,6 +992,8 @@ domain); } } + lastcheck = 0; /* If we need a new server before the TTL expires, + reset it. */ /* We have the read lock, but we need the write lock for changes :-( */ diff -u -r --new-file ypbind-mt-1.4/src/ypbind-mt.c ypbind-mt-1.5/src/ypbind-mt.c --- ypbind-mt-1.4/src/ypbind-mt.c Wed Nov 11 20:50:02 1998 +++ ypbind-mt-1.5/src/ypbind-mt.c Fri May 14 20:50:42 1999 @@ -1,6 +1,6 @@ -/* Copyright (c) 1998 Thorsten Kukuk +/* Copyright (c) 1998, 1999 Thorsten Kukuk This file is part of ypbind-mt. - Author: Thorsten Kukuk + Author: Thorsten Kukuk The ypbind-mt are free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as @@ -65,7 +65,9 @@ #ifndef _PATH_VARRUN #define _PATH_VARRUN "/etc/" #endif +#ifndef _YPBIND_PIDFILE #define _YPBIND_PIDFILE _PATH_VARRUN"ypbind.pid" +#endif #endif /* USE_PIDFILE */ char *domain = NULL; @@ -262,14 +264,20 @@ /* Is the pidfile locked by another ypserv ? */ if (fcntl (lock_fd, F_GETLK, &lock) < 0) - log_msg (LOG_ERR, _("fcntl error")); - - if (lock.l_type == F_UNLCK) + { + if (errno != ENOLCK) + { + log_msg (LOG_ERR, _("fcntl error: %s"), strerror (errno)); + /* XXX look, which pid is in pidfile */ + } + pid = 0; + } + else if (lock.l_type == F_UNLCK) pid = 0; /* false, region is not locked by another proc */ else pid = lock.l_pid; /* true, return pid of lock owner */ - if (0 != pid) + if (pid != 0) { log_msg (LOG_ERR, _("ypbind-mt already running (pid %d) - exiting"), pid); diff -u -r --new-file ypbind-mt-1.4/src/ypbind_server.c ypbind-mt-1.5/src/ypbind_server.c --- ypbind-mt-1.4/src/ypbind_server.c Wed Nov 11 20:55:15 1998 +++ ypbind-mt-1.5/src/ypbind_server.c Fri May 14 21:04:58 1999 @@ -1,8 +1,8 @@ -/* Copyright (c) 1998 Thorsten Kukuk +/* Copyright (c) 1998, 1999 Thorsten Kukuk, Germany This file is part of ypbind-mt. - Author: Thorsten Kukuk + Author: Thorsten Kukuk The ypbind-mt are free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as diff -u -r --new-file ypbind-mt-1.4/ypbind-mt.spec ypbind-mt-1.5/ypbind-mt.spec --- ypbind-mt-1.4/ypbind-mt.spec Wed Nov 11 21:02:25 1998 +++ ypbind-mt-1.5/ypbind-mt.spec Fri May 14 20:53:39 1999 @@ -1,11 +1,11 @@ Summary: NIS (YP) binding process Name: ypbind-mt -Version: 1.4 -Release: 1 +Version: 1.5 +Release: 0 Copyright: GPL Group: Networking Source: ftp.kernel.org:/pub/linux/utils/net/NIS/ypbind-mt-%{PACKAGE_VERSION}.tar.gz -Packager: Thorsten Kukuk +Packager: Thorsten Kukuk BuildRoot: /var/tmp/ypbind-mt Conflicts: ypbind @@ -16,7 +16,7 @@ This implementation is only for NIS _clients_. You must already have a NIS server running somewhere. You can find one for linux on -http://www-vt.uni-paderborn.de/~kukuk/linux/nis.html. Please read the +http://www.suse.de/~kukuk/linux/nis.html. Please read the NIS-HOWTO, too. %prep