Hello community,
here is the log from the commit of package ypbind for openSUSE:Factory checked
in at 2016-04-11 10:27:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ypbind (Old)
and /work/SRC/openSUSE:Factory/.ypbind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ypbind"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ypbind/ypbind.changes 2015-04-28
20:42:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ypbind.new/ypbind.changes 2016-04-11
10:27:16.000000000 +0200
@@ -1,0 +2,17 @@
+Wed Mar 2 15:15:26 CET 2016 - ku...@suse.de
+
+- Update to ypbind-2.4
+ - fix broadcast option
+
+-------------------------------------------------------------------
+Fri Feb 26 15:36:42 CET 2016 - ku...@suse.de
+
+- Don't abort if no NIS server could be found in a defined time.
+
+-------------------------------------------------------------------
+Mon Feb 15 14:20:06 CET 2016 - ku...@suse.de
+
+- Update to ypbind-2.3
+ - use libnsl/libtirpc instead of libnis
+
+-------------------------------------------------------------------
@@ -14,6 +30,0 @@
-
--------------------------------------------------------------------
-Mon Nov 17 01:39:00 UTC 2014 - Led <led...@gmail.com>
-
-- fix bashism in ypbind-systemd-post script
-- fix using 'echo' command in ypbind-systemd-pre script
Old:
----
ypbind-mt-2.2.tar.bz2
New:
----
ypbind-mt-2.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ypbind.spec ++++++
--- /var/tmp/diff_new_pack.Zu3kpS/_old 2016-04-11 10:27:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Zu3kpS/_new 2016-04-11 10:27:17.000000000 +0200
@@ -19,7 +19,7 @@
Name: ypbind
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 2.2
+Version: 2.4
Release: 0
Url: http://www.linux-nis.org/nis/ypbind-mt
Summary: NIS client daemon
@@ -27,14 +27,13 @@
Group: Productivity/Networking/NIS
BuildRequires: pkgconfig
%if %{suse_version} >= 1310
-BuildRequires: pkgconfig(libnis) >= 2.99.3
BuildRequires: pkgconfig(libsystemd-daemon)
-BuildRequires: pkgconfig(libtirpc)
+BuildRequires: pkgconfig(libtirpc) >= 1.0.1
+BuildRequires: pkgconfig(libnsl) >= 1.0.1
%else
-BuildRequires: libnis-devel
-BuildRequires: libtirpc-devel
+BuildRequires: libtirpc-devel >= 1.0.1
+BuildRequires: libnsl-devel => 1.0.1
%endif
-#BuildRequires: libxml2-tools
Requires: rpcbind
Requires: yp-tools
Source:
http://www.linux-nis.org/download/%name-mt/%name-mt-%version.tar.bz2
++++++ ypbind-mt-2.2.tar.bz2 -> ypbind-mt-2.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/ChangeLog new/ypbind-mt-2.4/ChangeLog
--- old/ypbind-mt-2.2/ChangeLog 2014-12-04 14:49:57.000000000 +0100
+++ new/ypbind-mt-2.4/ChangeLog 2016-03-02 15:11:00.000000000 +0100
@@ -1,3 +1,28 @@
+2016-03-02 Thorsten Kukuk <ku...@thkukuk.de>
+
+ * release version 2.4
+
+2016-02-26 Thorsten Kukuk <ku...@thkukuk.de>
+
+ * src/serv_list.c (convert_v3_to_respv2): Log informal message,
+ if we don't have an IPv4 address, but got a request for it.
+
+2016-02-23 Thorsten Kukuk <ku...@thkukuk.de>
+
+ * src/serv_list.c (eachresult): Make sure server_name is never NULL.
+
+2016-02-15 Thorsten Kukuk <ku...@thkukuk.de>
+
+ * release version 2.3
+
+ * lib/Makefile.am: Include ypbind3* sources and header file.
+ * src/serv_list.c: Include ypbind3_binding.h.
+ * src/ypbind_server.c: Likewise.
+ * lib/host2ypbind3_binding.c: New.
+ * lib/ypbind3_binding.h: New.
+ * lib/ypbind3_binding_dup.c: New.
+ * lib/ypbind3_binding_free.c: New.
+
2014-12-04 Thorsten Kukuk <ku...@thkukuk.de>
* release version 2.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/Makefile.in
new/ypbind-mt-2.4/Makefile.in
--- old/ypbind-mt-2.2/Makefile.in 2014-12-04 14:53:31.000000000 +0100
+++ new/ypbind-mt-2.4/Makefile.in 2016-03-02 15:10:33.000000000 +0100
@@ -243,8 +243,8 @@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
-NIS_CFLAGS = @NIS_CFLAGS@
-NIS_LIBS = @NIS_LIBS@
+NSL_CFLAGS = @NSL_CFLAGS@
+NSL_LIBS = @NSL_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/NEWS new/ypbind-mt-2.4/NEWS
--- old/ypbind-mt-2.2/NEWS 2014-12-04 14:55:20.000000000 +0100
+++ new/ypbind-mt-2.4/NEWS 2016-03-02 15:10:15.000000000 +0100
@@ -1,9 +1,15 @@
ypbind-mt NEWS -- history of user-visible changes.
-Copyright (C) 1998-2014 Thorsten Kukuk
+Copyright (C) 1998-2016 Thorsten Kukuk
Please send bug reports, questions and suggestions to <ku...@thkukuk.de>.
+Version 2.4
+* Fix broadcast for new NIS server
+
+Version 2.3
+* Use libnsl and not libnis
+
Version 2.2
* Fix handling if servers are not reacheable or ports have changed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/README new/ypbind-mt-2.4/README
--- old/ypbind-mt-2.2/README 2014-10-22 15:48:16.000000000 +0200
+++ new/ypbind-mt-2.4/README 2016-02-15 15:18:33.000000000 +0100
@@ -1,5 +1,5 @@
-This directory contains the version 3.x of ypbind-mt.
+This directory contains the version 2.x of ypbind-mt.
ypbind-mt is free software. You can redistribute it and/or modify it
under the terms of the GNU General Public License version 2 as published
@@ -10,7 +10,7 @@
* Supports ypbind protocol V1, V2, V3.
- * IPv6 support (needs ti-rpc! Else use old 2.x version).
+ * IPv6 support (needs TI-RPC and libnsl! Else use old 1.x version).
* Uses threads for better response.
@@ -19,11 +19,11 @@
* Supports a list of known secure NIS server (/etc/yp.conf)
-The following features against version 2.x were dropped:
+The following features against version 1.x were dropped:
* Listen to DBUS/NetworkManager.
* Use SLP to find a running ypserv
-Thorsten Kukuk <ku...@suse.de>, October, 2014
+Thorsten Kukuk <ku...@suse.de>, February, 2016
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/config.h.in
new/ypbind-mt-2.4/config.h.in
--- old/ypbind-mt-2.2/config.h.in 2014-12-04 14:53:35.000000000 +0100
+++ new/ypbind-mt-2.4/config.h.in 2016-03-02 15:12:19.000000000 +0100
@@ -52,6 +52,9 @@
/* Define to 1 if you have the <sys/types.h> header file. */
#undef HAVE_SYS_TYPES_H
+/* Define to 1 if TIRPC is available */
+#undef HAVE_TIRPC
+
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/configure new/ypbind-mt-2.4/configure
--- old/ypbind-mt-2.2/configure 2014-12-04 14:53:26.000000000 +0100
+++ new/ypbind-mt-2.4/configure 2016-03-02 15:10:35.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ypbind-mt 2.2.
+# Generated by GNU Autoconf 2.69 for ypbind-mt 2.4.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@
# Identity of this package.
PACKAGE_NAME='ypbind-mt'
PACKAGE_TARNAME='ypbind-mt'
-PACKAGE_VERSION='2.2'
-PACKAGE_STRING='ypbind-mt 2.2'
+PACKAGE_VERSION='2.4'
+PACKAGE_STRING='ypbind-mt 2.4'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -650,8 +650,8 @@
XSLTPROC
TIRPC_LIBS
TIRPC_CFLAGS
-NIS_LIBS
-NIS_CFLAGS
+NSL_LIBS
+NSL_CFLAGS
USE_SD_NOTIFY
SYSTEMD_LIBS
SYSTEMD_CFLAGS
@@ -779,8 +779,8 @@
PKG_CONFIG_LIBDIR
SYSTEMD_CFLAGS
SYSTEMD_LIBS
-NIS_CFLAGS
-NIS_LIBS
+NSL_CFLAGS
+NSL_LIBS
TIRPC_CFLAGS
TIRPC_LIBS'
@@ -1323,7 +1323,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ypbind-mt 2.2 to adapt to many kinds of systems.
+\`configure' configures ypbind-mt 2.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1393,7 +1393,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ypbind-mt 2.2:";;
+ short | recursive ) echo "Configuration of ypbind-mt 2.4:";;
esac
cat <<\_ACEOF
@@ -1439,8 +1439,8 @@
C compiler flags for SYSTEMD, overriding pkg-config
SYSTEMD_LIBS
linker flags for SYSTEMD, overriding pkg-config
- NIS_CFLAGS C compiler flags for NIS, overriding pkg-config
- NIS_LIBS linker flags for NIS, overriding pkg-config
+ NSL_CFLAGS C compiler flags for NSL, overriding pkg-config
+ NSL_LIBS linker flags for NSL, overriding pkg-config
TIRPC_CFLAGS
C compiler flags for TIRPC, overriding pkg-config
TIRPC_LIBS linker flags for TIRPC, overriding pkg-config
@@ -1511,7 +1511,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ypbind-mt configure 2.2
+ypbind-mt configure 2.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1876,7 +1876,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ypbind-mt $as_me 2.2, which was
+It was created by ypbind-mt $as_me 2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2741,7 +2741,7 @@
# Define the identity of the package.
PACKAGE='ypbind-mt'
- VERSION='2.2'
+ VERSION='2.4'
cat >>confdefs.h <<_ACEOF
@@ -4718,21 +4718,22 @@
USE_SD_NOTIFY=1
fi
+#PKG_CHECK_MODULES([NSL], [libnsl], [],
[AC_CHECK_LIB([nsl],[yp_match],[LIBNSL_LIBS="-lnsl"],[LIBNSL_LIBS=""])])
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NIS" >&5
-$as_echo_n "checking for NIS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSL" >&5
+$as_echo_n "checking for NSL... " >&6; }
-if test -n "$NIS_CFLAGS"; then
- pkg_cv_NIS_CFLAGS="$NIS_CFLAGS"
+if test -n "$NSL_CFLAGS"; then
+ pkg_cv_NSL_CFLAGS="$NSL_CFLAGS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnis\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnis") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnsl\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnsl") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NIS_CFLAGS=`$PKG_CONFIG --cflags "libnis" 2>/dev/null`
+ pkg_cv_NSL_CFLAGS=`$PKG_CONFIG --cflags "libnsl" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -4740,16 +4741,16 @@
else
pkg_failed=untried
fi
-if test -n "$NIS_LIBS"; then
- pkg_cv_NIS_LIBS="$NIS_LIBS"
+if test -n "$NSL_LIBS"; then
+ pkg_cv_NSL_LIBS="$NSL_LIBS"
elif test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnis\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnis") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists
--print-errors \"libnsl\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnsl") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; then
- pkg_cv_NIS_LIBS=`$PKG_CONFIG --libs "libnis" 2>/dev/null`
+ pkg_cv_NSL_LIBS=`$PKG_CONFIG --libs "libnsl" 2>/dev/null`
test "x$?" != "x0" && pkg_failed=yes
else
pkg_failed=yes
@@ -4770,22 +4771,22 @@
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- NIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnis" 2>&1`
+ NSL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors
--cflags --libs "libnsl" 2>&1`
else
- NIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libnis" 2>&1`
+ NSL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs
"libnsl" 2>&1`
fi
# Put the nasty error message in config.log where it belongs
- echo "$NIS_PKG_ERRORS" >&5
+ echo "$NSL_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libnis) were not met:
+ as_fn_error $? "Package requirements (libnsl) were not met:
-$NIS_PKG_ERRORS
+$NSL_PKG_ERRORS
Consider adjusting the PKG_CONFIG_PATH environment variable if you
installed software in a non-standard prefix.
-Alternatively, you may set the environment variables NIS_CFLAGS
-and NIS_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables NSL_CFLAGS
+and NSL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details." "$LINENO" 5
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -4796,15 +4797,15 @@
is in your PATH or set the PKG_CONFIG environment variable to the full
path to pkg-config.
-Alternatively, you may set the environment variables NIS_CFLAGS
-and NIS_LIBS to avoid the need to call pkg-config.
+Alternatively, you may set the environment variables NSL_CFLAGS
+and NSL_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details" "$LINENO" 5; }
else
- NIS_CFLAGS=$pkg_cv_NIS_CFLAGS
- NIS_LIBS=$pkg_cv_NIS_LIBS
+ NSL_CFLAGS=$pkg_cv_NSL_CFLAGS
+ NSL_LIBS=$pkg_cv_NSL_LIBS
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
@@ -4868,31 +4869,11 @@
# Put the nasty error message in config.log where it belongs
echo "$TIRPC_PKG_ERRORS" >&5
- as_fn_error $? "Package requirements (libtirpc) were not met:
-
-$TIRPC_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables TIRPC_CFLAGS
-and TIRPC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
+ TIRPC_LIBS=""
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make
sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables TIRPC_CFLAGS
-and TIRPC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+ TIRPC_LIBS=""
else
TIRPC_CFLAGS=$pkg_cv_TIRPC_CFLAGS
TIRPC_LIBS=$pkg_cv_TIRPC_LIBS
@@ -4900,6 +4881,11 @@
$as_echo "yes" >&6; }
fi
+if test -n "$TIRPC_LIBS"; then
+
+$as_echo "#define HAVE_TIRPC 1" >>confdefs.h
+
+fi
for ac_func in __nss_configure_lookup
do :
@@ -7916,7 +7902,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ypbind-mt $as_me 2.2, which was
+This file was extended by ypbind-mt $as_me 2.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7982,7 +7968,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ypbind-mt config.status 2.2
+ypbind-mt config.status 2.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/configure.ac
new/ypbind-mt-2.4/configure.ac
--- old/ypbind-mt-2.2/configure.ac 2014-12-04 14:53:25.000000000 +0100
+++ new/ypbind-mt-2.4/configure.ac 2016-03-02 15:10:26.000000000 +0100
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT([ypbind-mt], [2.2])
+AC_INIT([ypbind-mt], [2.4])
AC_CONFIG_SRCDIR([src/ypbind-mt.c])
AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(config.h)
@@ -26,8 +26,12 @@
PKG_CHECK_MODULES([SYSTEMD], [libsystemd >= 209], [USE_SD_NOTIFY=1],
[USE_SD_NOTIFY=0])
AC_SUBST(USE_SD_NOTIFY)
-PKG_CHECK_MODULES([NIS], [libnis])
-PKG_CHECK_MODULES([TIRPC], [libtirpc])
+#PKG_CHECK_MODULES([NSL], [libnsl], [],
[AC_CHECK_LIB([nsl],[yp_match],[LIBNSL_LIBS="-lnsl"],[LIBNSL_LIBS=""])])
+PKG_CHECK_MODULES([NSL], [libnsl])
+PKG_CHECK_MODULES([TIRPC], [libtirpc], [], [TIRPC_LIBS=""])
+if test -n "$TIRPC_LIBS"; then
+ AC_DEFINE(HAVE_TIRPC, 1, [Define to 1 if TIRPC is available])
+fi
dnl The difficult part: could we reconfigure NSS or must we use DNS ?
AC_CHECK_FUNCS(__nss_configure_lookup)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/lib/Makefile.am
new/ypbind-mt-2.4/lib/Makefile.am
--- old/ypbind-mt-2.2/lib/Makefile.am 2014-10-20 13:18:36.000000000 +0200
+++ new/ypbind-mt-2.4/lib/Makefile.am 2016-02-15 13:04:02.000000000 +0100
@@ -6,13 +6,15 @@
# Process this file with automake to produce Makefile.in.
noinst_LIBRARIES = libcompat.a
+noinst_HEADERS = ypbind3_binding.h
AM_CFLAGS = -D_REENTRANT=1 @WARNFLAGS@
+AM_CPPFLAGS = -I$(srcdir) @TIRPC_CFLAGS@ @NSL_CFLAGS@
-DLOCALEDIR=\"$(localedir)\"
-libcompat_a_SOURCES = dns_hosts.c res_options.h
+libcompat_a_SOURCES = dns_hosts.c res_options.h ypbind3_binding_dup.c \
+ ypbind3_binding_free.c host2ypbind3_binding.c
libcompat_a_LIBADD = @LIBOBJS@
localedir = $(datadir)/locale
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
CLEANFILES = *~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/lib/Makefile.in
new/ypbind-mt-2.4/lib/Makefile.in
--- old/ypbind-mt-2.2/lib/Makefile.in 2014-12-04 14:53:31.000000000 +0100
+++ new/ypbind-mt-2.4/lib/Makefile.in 2016-03-02 15:10:33.000000000 +0100
@@ -21,6 +21,7 @@
#
# Process this file with automake to produce Makefile.in.
+
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__make_running_with_option = \
@@ -87,7 +88,8 @@
host_triplet = @host@
subdir = lib
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
- $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
+ $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp \
+ $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \
$(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/isc-posix.m4 \
@@ -111,7 +113,9 @@
am__v_AR_1 =
libcompat_a_AR = $(AR) $(ARFLAGS)
libcompat_a_DEPENDENCIES = @LIBOBJS@
-am_libcompat_a_OBJECTS = dns_hosts.$(OBJEXT)
+am_libcompat_a_OBJECTS = dns_hosts.$(OBJEXT) \
+ ypbind3_binding_dup.$(OBJEXT) ypbind3_binding_free.$(OBJEXT) \
+ host2ypbind3_binding.$(OBJEXT)
libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS)
AM_V_P = $(am__v_P_@AM_V@)
am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -148,6 +152,7 @@
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
+HEADERS = $(noinst_HEADERS)
am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
# Read a list of newline-separated strings from the standard input,
# and print each of them once, without duplicates. Input order is
@@ -212,8 +217,8 @@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
-NIS_CFLAGS = @NIS_CFLAGS@
-NIS_LIBS = @NIS_LIBS@
+NSL_CFLAGS = @NSL_CFLAGS@
+NSL_LIBS = @NSL_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -298,10 +303,13 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
noinst_LIBRARIES = libcompat.a
+noinst_HEADERS = ypbind3_binding.h
AM_CFLAGS = -D_REENTRANT=1 @WARNFLAGS@
-libcompat_a_SOURCES = dns_hosts.c res_options.h
+AM_CPPFLAGS = -I$(srcdir) @TIRPC_CFLAGS@ @NSL_CFLAGS@
-DLOCALEDIR=\"$(localedir)\"
+libcompat_a_SOURCES = dns_hosts.c res_options.h ypbind3_binding_dup.c \
+ ypbind3_binding_free.c host2ypbind3_binding.c
+
libcompat_a_LIBADD = @LIBOBJS@
-AM_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
CLEANFILES = *~
all: all-am
@@ -353,6 +361,9 @@
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns_hosts.Po@am__quote@
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/host2ypbind3_binding.Po@am__quote@
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/ypbind3_binding_dup.Po@am__quote@
+@AMDEP_TRUE@@am__include@
@am__quote@./$(DEPDIR)/ypbind3_binding_free.Po@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF
$(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -452,7 +463,7 @@
done
check-am: all-am
check: check-am
-all-am: Makefile $(LIBRARIES)
+all-am: Makefile $(LIBRARIES) $(HEADERS)
installdirs:
install: install-am
install-exec: install-exec-am
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/lib/host2ypbind3_binding.c
new/ypbind-mt-2.4/lib/host2ypbind3_binding.c
--- old/ypbind-mt-2.2/lib/host2ypbind3_binding.c 1970-01-01
01:00:00.000000000 +0100
+++ new/ypbind-mt-2.4/lib/host2ypbind3_binding.c 2016-02-15
13:04:15.000000000 +0100
@@ -0,0 +1,54 @@
+/* Copyright (C) 2014 Thorsten Kukuk
+ Author: Thorsten Kukuk <ku...@suse.de>
+
+ This library is free software: you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ in version 2.1 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rpcsvc/yp_prot.h>
+#include "ypbind3_binding.h"
+
+struct ypbind3_binding *
+__host2ypbind3_binding (const char *host)
+{
+ const struct timeval TIMEOUT10 = {1, 0};
+ CLIENT *server;
+ ypbind3_binding ypb3, *res;
+ struct netconfig *nconf;
+ struct netbuf nbuf;
+
+ /* connect to server to find out if it exist and runs */
+ if ((server = clnt_create_timed (host, YPPROG, YPVERS,
+ "datagram_n", &TIMEOUT10)) == NULL)
+ return NULL;
+
+ /* get nconf, netbuf structures */
+ nconf = getnetconfigent (server->cl_netid);
+ clnt_control(server, CLGET_SVC_ADDR, (char *)&nbuf);
+
+ ypb3.ypbind_nconf = nconf;
+ ypb3.ypbind_svcaddr = (struct netbuf *)(&nbuf);
+ ypb3.ypbind_servername = (char *)host;
+ ypb3.ypbind_hi_vers = YPVERS;
+ ypb3.ypbind_lo_vers = YPVERS;
+
+ res = __ypbind3_binding_dup (&ypb3);
+
+ freenetconfigent (nconf);
+
+ clnt_destroy (server);
+
+ return res;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/lib/ypbind3_binding.h
new/ypbind-mt-2.4/lib/ypbind3_binding.h
--- old/ypbind-mt-2.2/lib/ypbind3_binding.h 1970-01-01 01:00:00.000000000
+0100
+++ new/ypbind-mt-2.4/lib/ypbind3_binding.h 2016-02-03 13:39:58.000000000
+0100
@@ -0,0 +1,23 @@
+/* Copyright (C) 2016 Thorsten Kukuk
+ Author: Thorsten Kukuk <ku...@suse.de>
+
+ This library is free software: you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ in version 2.1 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef _YPBIND3_BINDING_H_
+#define _YPBIND3_BINDING_H_
+
+extern struct ypbind3_binding *__host2ypbind3_binding (const char *__host);
+extern struct ypbind3_binding *__ypbind3_binding_dup (struct ypbind3_binding
*__src);
+extern void __ypbind3_binding_free (struct ypbind3_binding *ypb);
+
+#endif /* _YPBIND3_BINDING_H_ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/lib/ypbind3_binding_dup.c
new/ypbind-mt-2.4/lib/ypbind3_binding_dup.c
--- old/ypbind-mt-2.2/lib/ypbind3_binding_dup.c 1970-01-01 01:00:00.000000000
+0100
+++ new/ypbind-mt-2.4/lib/ypbind3_binding_dup.c 2016-02-23 16:09:15.000000000
+0100
@@ -0,0 +1,99 @@
+/* Copyright (C) 2014 Thorsten Kukuk
+ Author: Thorsten Kukuk <ku...@suse.de>
+
+ This library is free software: you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ in version 2.1 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <rpcsvc/yp_prot.h>
+#include "ypbind3_binding.h"
+
+struct ypbind3_binding *
+__ypbind3_binding_dup (struct ypbind3_binding *src)
+{
+#define copy_str(source, dest) \
+ if (source != NULL) \
+ { \
+ dest = strdup (source); \
+ if (dest == NULL) \
+ { \
+ __ypbind3_binding_free (dst); \
+ return NULL; \
+ } \
+ }
+
+ struct ypbind3_binding *dst;
+ unsigned long i;
+
+ dst = calloc(1, sizeof (struct ypbind3_binding));
+ if (dst == NULL)
+ return NULL;
+
+ dst->ypbind_nconf = calloc (1, sizeof (struct netconfig));
+ if (dst->ypbind_nconf == NULL)
+ {
+ __ypbind3_binding_free (dst);
+ return NULL;
+ }
+ dst->ypbind_svcaddr = calloc(1, sizeof (struct netbuf));
+ if (dst->ypbind_svcaddr == NULL)
+ {
+ __ypbind3_binding_free (dst);
+ return NULL;
+ }
+ dst->ypbind_hi_vers = src->ypbind_hi_vers;
+ dst->ypbind_lo_vers = src->ypbind_lo_vers;
+ if (src->ypbind_servername)
+ dst->ypbind_servername =
+ strdup(src->ypbind_servername);
+
+ copy_str (src->ypbind_nconf->nc_netid, dst->ypbind_nconf->nc_netid);
+ dst->ypbind_nconf->nc_semantics = src->ypbind_nconf->nc_semantics;
+ dst->ypbind_nconf->nc_flag = src->ypbind_nconf->nc_flag;
+ copy_str (src->ypbind_nconf->nc_protofmly, dst->ypbind_nconf->nc_protofmly);
+ copy_str (src->ypbind_nconf->nc_proto, dst->ypbind_nconf->nc_proto);
+ copy_str (src->ypbind_nconf->nc_device, dst->ypbind_nconf->nc_device);
+ dst->ypbind_nconf->nc_nlookups = src->ypbind_nconf->nc_nlookups;
+
+ dst->ypbind_nconf->nc_lookups = calloc (src->ypbind_nconf->nc_nlookups,
+ sizeof (char *));
+ if (dst->ypbind_nconf->nc_lookups == NULL)
+ {
+ __ypbind3_binding_free (dst);
+ return NULL;
+ }
+ for (i = 0; i < src->ypbind_nconf->nc_nlookups; i++)
+ dst->ypbind_nconf->nc_lookups[i] =
+ src->ypbind_nconf->nc_lookups[i] ?
+ strdup (src->ypbind_nconf->nc_lookups[i]) : NULL;
+
+ for (i = 0; i < 8; i++)
+ dst->ypbind_nconf->nc_unused[i] = src->ypbind_nconf->nc_unused[i];
+
+ dst->ypbind_svcaddr->maxlen = src->ypbind_svcaddr->maxlen;
+ dst->ypbind_svcaddr->len = src->ypbind_svcaddr->len;
+ dst->ypbind_svcaddr->buf = malloc (src->ypbind_svcaddr->maxlen);
+ if (dst->ypbind_svcaddr->buf == NULL)
+ {
+ __ypbind3_binding_free (dst);
+ return NULL;
+ }
+ memcpy (dst->ypbind_svcaddr->buf, src->ypbind_svcaddr->buf,
+ dst->ypbind_svcaddr->len);
+
+ return dst;
+#undef copy_str
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/lib/ypbind3_binding_free.c
new/ypbind-mt-2.4/lib/ypbind3_binding_free.c
--- old/ypbind-mt-2.2/lib/ypbind3_binding_free.c 1970-01-01
01:00:00.000000000 +0100
+++ new/ypbind-mt-2.4/lib/ypbind3_binding_free.c 2016-02-03
15:15:41.000000000 +0100
@@ -0,0 +1,35 @@
+/* Copyright (C) 2014 Thorsten Kukuk
+ Author: Thorsten Kukuk <ku...@suse.de>
+
+ This library is free software: you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public License
+ in version 2.1 as published by the Free Software Foundation.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <rpcsvc/yp_prot.h>
+#include "ypbind3_binding.h"
+
+void
+__ypbind3_binding_free (struct ypbind3_binding *ypb)
+{
+ if (ypb == NULL)
+ return;
+ /* netdir_free ((void *)ypb->ypbind_svcaddr, ND_ADDR); */
+ if (ypb->ypbind_svcaddr->buf)
+ free (ypb->ypbind_svcaddr->buf);
+ free (ypb->ypbind_svcaddr);
+ free (ypb->ypbind_servername);
+ freenetconfigent (ypb->ypbind_nconf);
+ free (ypb);
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/man/Makefile.in
new/ypbind-mt-2.4/man/Makefile.in
--- old/ypbind-mt-2.2/man/Makefile.in 2014-12-04 14:53:31.000000000 +0100
+++ new/ypbind-mt-2.4/man/Makefile.in 2016-03-02 15:10:33.000000000 +0100
@@ -197,8 +197,8 @@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
-NIS_CFLAGS = @NIS_CFLAGS@
-NIS_LIBS = @NIS_LIBS@
+NSL_CFLAGS = @NSL_CFLAGS@
+NSL_LIBS = @NSL_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/man/yp.conf.5
new/ypbind-mt-2.4/man/yp.conf.5
--- old/ypbind-mt-2.2/man/yp.conf.5 2014-12-04 14:54:41.000000000 +0100
+++ new/ypbind-mt-2.4/man/yp.conf.5 2016-02-15 14:30:16.000000000 +0100
@@ -2,12 +2,12 @@
.\" Title: yp.conf
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 12/04/2014
+.\" Date: 02/15/2016
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
.\" Language: English
.\"
-.TH "YP\&.CONF" "5" "12/04/2014" "ypbind-mt" "ypbind\-mt"
+.TH "YP\&.CONF" "5" "02/15/2016" "ypbind-mt" "ypbind\-mt"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/man/ypbind.8
new/ypbind-mt-2.4/man/ypbind.8
--- old/ypbind-mt-2.2/man/ypbind.8 2014-12-04 14:54:40.000000000 +0100
+++ new/ypbind-mt-2.4/man/ypbind.8 2016-02-15 14:30:16.000000000 +0100
@@ -2,12 +2,12 @@
.\" Title: ypbind
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\" Date: 12/04/2014
+.\" Date: 02/15/2016
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
.\" Language: English
.\"
-.TH "YPBIND" "8" "12/04/2014" "ypbind-mt" "ypbind\-mt"
+.TH "YPBIND" "8" "02/15/2016" "ypbind-mt" "ypbind\-mt"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
Files old/ypbind-mt-2.2/po/de.gmo and new/ypbind-mt-2.4/po/de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/po/de.po new/ypbind-mt-2.4/po/de.po
--- old/ypbind-mt-2.2/po/de.po 2014-12-04 15:26:30.000000000 +0100
+++ new/ypbind-mt-2.4/po/de.po 2016-03-02 15:12:19.000000000 +0100
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt\n"
"Report-Msgid-Bugs-To: ku...@linux-nis.org\n"
-"POT-Creation-Date: 2014-12-04 15:26+0100\n"
+"POT-Creation-Date: 2016-03-02 15:12+0100\n"
"PO-Revision-Date: 2004-02-13 16:22+01:00\n"
"Last-Translator: Thorsten Kukuk <ku...@suse.de>\n"
"Language-Team: No Language-Team\n"
@@ -15,71 +15,71 @@
"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8-bit\n"
-#: src/serv_list.c:472
+#: src/serv_list.c:478
msgid "Not enough memory !"
msgstr "Nicht genug Arbeitsspeicher !"
-#: src/serv_list.c:497
+#: src/serv_list.c:503
msgid "internal error: add_server called with NULL domain."
msgstr ""
"Interner Fehler: add_server wurde mit NULL pointer f�r domain aufgerufen."
-#: src/serv_list.c:512
+#: src/serv_list.c:518
#, c-format
msgid "add_server() domain: %s, broadcast"
msgstr "add_server() Domain: %s, Broadcast"
-#: src/serv_list.c:527
+#: src/serv_list.c:533
#, c-format
msgid "add_server() domain: %s, host: %s, NO SLOT FREE!"
msgstr "add_server() Domain: %s, Rechner: %s, Kein Slot mehr frei!"
-#: src/serv_list.c:534
+#: src/serv_list.c:540
#, c-format
msgid "add_server() domain: %s, host: %s, slot: %d"
msgstr "add_server() Domain: %s, Rechner: %s, Slot: %d"
-#: src/serv_list.c:559 src/serv_list.c:760
+#: src/serv_list.c:563 src/serv_list.c:761
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr "Antwort f�r Domain \"%s\" vom Server \"%s\""
-#: src/serv_list.c:569
+#: src/serv_list.c:570
#, c-format
msgid "Answer for domain '%s' from '%s' on illegal port %d."
msgstr "Antwort f�r Domain \"%s\" vom Server \"%s\" vom illegalen Port %d."
-#: src/serv_list.c:607
+#: src/serv_list.c:608
#, c-format
msgid "do_broadcast() for domain '%s' is called"
msgstr ""
-#: src/serv_list.c:646
+#: src/serv_list.c:647
#, c-format
msgid "leave do_broadcast() for domain '%s'"
msgstr ""
-#: src/serv_list.c:697
+#: src/serv_list.c:698
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr "Ping Host \"%s\", Domain \"%s\""
-#: src/serv_list.c:708
+#: src/serv_list.c:709
#, 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:731
+#: src/serv_list.c:732
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr "Domain \"%s\" wird nicht von \"%s\" unterst�tzt"
-#: src/serv_list.c:840
+#: src/serv_list.c:841
#, fuzzy, c-format
msgid "Ping active server for '%s'"
msgstr "Sende ein Ping zu allen aktiven Servern."
-#: src/serv_list.c:842
+#: src/serv_list.c:843
#, fuzzy
msgid "Ping active servers for all domains."
msgstr "Sende ein Ping zu allen aktiven Servern."
@@ -306,30 +306,30 @@
msgid "svc_run returned."
msgstr "svc_run hat sich beendet."
-#: src/ypbind_server.c:123 src/ypbind_server.c:226 src/ypbind_server.c:281
+#: src/ypbind_server.c:124 src/ypbind_server.c:227 src/ypbind_server.c:282
#, c-format
msgid "Domain name '%s' has embedded slash -- rejecting."
msgstr "Domainname \"%s\" enth�lt einen Schr�gstrich -- zur�ckgewiesen."
-#: src/ypbind_server.c:136 src/ypbind_server.c:245
+#: src/ypbind_server.c:137 src/ypbind_server.c:246
#, fuzzy, c-format
msgid "Status: YPBIND_FAIL_VAL, %s"
msgstr "Status: YPBIND_FAIL_VAL"
-#: src/ypbind_server.c:139 src/ypbind_server.c:249
+#: src/ypbind_server.c:140 src/ypbind_server.c:250
msgid "Status: YPBIND_SUCC_VAL"
msgstr "Status: YPBIND_SUCC_VAL"
-#: src/ypbind_server.c:314 src/ypbind_server.c:359
+#: src/ypbind_server.c:315 src/ypbind_server.c:360
#, 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:326 src/ypbind_server.c:371
+#: src/ypbind_server.c:327 src/ypbind_server.c:372
msgid "Changing the binding is not allowed."
msgstr "Das �ndern des Bindings ist nicht erlaubt."
-#: src/ypbind_server.c:333 src/ypbind_server.c:378
+#: src/ypbind_server.c:334 src/ypbind_server.c:379
msgid "SETDOM request doesn't come from reserved port."
msgstr "Der SETDOM Request kam nicht von einem reservierten Port."
Files old/ypbind-mt-2.2/po/sv.gmo and new/ypbind-mt-2.4/po/sv.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/po/sv.po new/ypbind-mt-2.4/po/sv.po
--- old/ypbind-mt-2.2/po/sv.po 2014-12-04 15:26:30.000000000 +0100
+++ new/ypbind-mt-2.4/po/sv.po 2016-03-02 15:12:19.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt 1.20-2\n"
"Report-Msgid-Bugs-To: ku...@linux-nis.org\n"
-"POT-Creation-Date: 2014-12-04 15:26+0100\n"
+"POT-Creation-Date: 2016-03-02 15:12+0100\n"
"PO-Revision-Date: 2006-11-12 16:48+0100\n"
"Last-Translator: Daniel Nylander <p...@danielnylander.se>\n"
"Language-Team: Swedish <tp...@listor.tp-sv.se>\n"
@@ -16,70 +16,70 @@
"Content-Type: text/plain; charset=iso-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/serv_list.c:472
+#: src/serv_list.c:478
msgid "Not enough memory !"
msgstr "Inte tillr�ckligt med minne!"
-#: src/serv_list.c:497
+#: src/serv_list.c:503
msgid "internal error: add_server called with NULL domain."
msgstr "internt fel: add_server anropades med NULL dom�n."
-#: src/serv_list.c:512
+#: src/serv_list.c:518
#, c-format
msgid "add_server() domain: %s, broadcast"
msgstr "add_server() dom�n: %s, broadcast"
-#: src/serv_list.c:527
+#: src/serv_list.c:533
#, c-format
msgid "add_server() domain: %s, host: %s, NO SLOT FREE!"
msgstr "add_server() dom�n: %s, v�rd: %s, INGEN LEDIG PLATS!"
-#: src/serv_list.c:534
+#: src/serv_list.c:540
#, c-format
msgid "add_server() domain: %s, host: %s, slot: %d"
msgstr "add_server() dom�n: %s, v�rd: %s, plats: %d"
-#: src/serv_list.c:559 src/serv_list.c:760
+#: src/serv_list.c:563 src/serv_list.c:761
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr "Svar f�r dom�nen \"%s\" fr�n servern \"%s\""
-#: src/serv_list.c:569
+#: src/serv_list.c:570
#, c-format
msgid "Answer for domain '%s' from '%s' on illegal port %d."
msgstr "Svar f�r dom�nen \"%s\" fr�n \"%s\" p� ogiltiga porten %d."
-#: src/serv_list.c:607
+#: src/serv_list.c:608
#, c-format
msgid "do_broadcast() for domain '%s' is called"
msgstr "do_broadcast() f�r dom�nen \"%s\" anropas"
-#: src/serv_list.c:646
+#: src/serv_list.c:647
#, c-format
msgid "leave do_broadcast() for domain '%s'"
msgstr "l�mna do_broadcast() f�r dom�nen \"%s\""
-#: src/serv_list.c:697
+#: src/serv_list.c:698
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr "pinga v�rden \"%s\", dom�n \"%s\""
-#: src/serv_list.c:708
+#: src/serv_list.c:709
#, c-format
msgid "clnt_create for server '%s' (domain '%s') failed"
msgstr "clnt_create f�r servern \"%s\" (dom�n \"%s\") misslyckades"
-#: src/serv_list.c:731
+#: src/serv_list.c:732
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr "dom�nen \"%s\" hanteras inte av \"%s\""
-#: src/serv_list.c:840
+#: src/serv_list.c:841
#, fuzzy, c-format
msgid "Ping active server for '%s'"
msgstr "Pingar alla aktiva servrar."
-#: src/serv_list.c:842
+#: src/serv_list.c:843
#, fuzzy
msgid "Ping active servers for all domains."
msgstr "Pingar alla aktiva servrar."
@@ -306,30 +306,30 @@
msgid "svc_run returned."
msgstr "svc_run �terv�nde."
-#: src/ypbind_server.c:123 src/ypbind_server.c:226 src/ypbind_server.c:281
+#: src/ypbind_server.c:124 src/ypbind_server.c:227 src/ypbind_server.c:282
#, c-format
msgid "Domain name '%s' has embedded slash -- rejecting."
msgstr "Dom�nnamnet \"%s\" har inb�ddat snedstreck -- v�grar."
-#: src/ypbind_server.c:136 src/ypbind_server.c:245
+#: src/ypbind_server.c:137 src/ypbind_server.c:246
#, fuzzy, c-format
msgid "Status: YPBIND_FAIL_VAL, %s"
msgstr "Status: YPBIND_FAIL_VAL"
-#: src/ypbind_server.c:139 src/ypbind_server.c:249
+#: src/ypbind_server.c:140 src/ypbind_server.c:250
msgid "Status: YPBIND_SUCC_VAL"
msgstr "Status: YPBIND_SUCC_VAL"
-#: src/ypbind_server.c:314 src/ypbind_server.c:359
+#: src/ypbind_server.c:315 src/ypbind_server.c:360
#, c-format
msgid "User from '%s' try's to change the binding."
msgstr "Anv�ndare fr�n \"%s\" f�rs�ker �ndra bindningen."
-#: src/ypbind_server.c:326 src/ypbind_server.c:371
+#: src/ypbind_server.c:327 src/ypbind_server.c:372
msgid "Changing the binding is not allowed."
msgstr "�ndring av bindningen till�ts inte."
-#: src/ypbind_server.c:333 src/ypbind_server.c:378
+#: src/ypbind_server.c:334 src/ypbind_server.c:379
msgid "SETDOM request doesn't come from reserved port."
msgstr "SETDOM-beg�ran kommer inte fr�n reserverad port."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/po/ypbind-mt.pot
new/ypbind-mt-2.4/po/ypbind-mt.pot
--- old/ypbind-mt-2.2/po/ypbind-mt.pot 2014-12-04 15:26:30.000000000 +0100
+++ new/ypbind-mt-2.4/po/ypbind-mt.pot 2016-03-02 15:12:19.000000000 +0100
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: ypbind-mt 2.2\n"
+"Project-Id-Version: ypbind-mt 2.4\n"
"Report-Msgid-Bugs-To: ku...@linux-nis.org\n"
-"POT-Creation-Date: 2014-12-04 15:26+0100\n"
+"POT-Creation-Date: 2016-03-02 15:12+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <l...@li.org>\n"
@@ -17,70 +17,70 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/serv_list.c:472
+#: src/serv_list.c:478
msgid "Not enough memory !"
msgstr ""
-#: src/serv_list.c:497
+#: src/serv_list.c:503
msgid "internal error: add_server called with NULL domain."
msgstr ""
-#: src/serv_list.c:512
+#: src/serv_list.c:518
#, c-format
msgid "add_server() domain: %s, broadcast"
msgstr ""
-#: src/serv_list.c:527
+#: src/serv_list.c:533
#, c-format
msgid "add_server() domain: %s, host: %s, NO SLOT FREE!"
msgstr ""
-#: src/serv_list.c:534
+#: src/serv_list.c:540
#, c-format
msgid "add_server() domain: %s, host: %s, slot: %d"
msgstr ""
-#: src/serv_list.c:559 src/serv_list.c:760
+#: src/serv_list.c:563 src/serv_list.c:761
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr ""
-#: src/serv_list.c:569
+#: src/serv_list.c:570
#, c-format
msgid "Answer for domain '%s' from '%s' on illegal port %d."
msgstr ""
-#: src/serv_list.c:607
+#: src/serv_list.c:608
#, c-format
msgid "do_broadcast() for domain '%s' is called"
msgstr ""
-#: src/serv_list.c:646
+#: src/serv_list.c:647
#, c-format
msgid "leave do_broadcast() for domain '%s'"
msgstr ""
-#: src/serv_list.c:697
+#: src/serv_list.c:698
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr ""
-#: src/serv_list.c:708
+#: src/serv_list.c:709
#, c-format
msgid "clnt_create for server '%s' (domain '%s') failed"
msgstr ""
-#: src/serv_list.c:731
+#: src/serv_list.c:732
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr ""
-#: src/serv_list.c:840
+#: src/serv_list.c:841
#, c-format
msgid "Ping active server for '%s'"
msgstr ""
-#: src/serv_list.c:842
+#: src/serv_list.c:843
msgid "Ping active servers for all domains."
msgstr ""
@@ -302,30 +302,30 @@
msgid "svc_run returned."
msgstr ""
-#: src/ypbind_server.c:123 src/ypbind_server.c:226 src/ypbind_server.c:281
+#: src/ypbind_server.c:124 src/ypbind_server.c:227 src/ypbind_server.c:282
#, c-format
msgid "Domain name '%s' has embedded slash -- rejecting."
msgstr ""
-#: src/ypbind_server.c:136 src/ypbind_server.c:245
+#: src/ypbind_server.c:137 src/ypbind_server.c:246
#, c-format
msgid "Status: YPBIND_FAIL_VAL, %s"
msgstr ""
-#: src/ypbind_server.c:139 src/ypbind_server.c:249
+#: src/ypbind_server.c:140 src/ypbind_server.c:250
msgid "Status: YPBIND_SUCC_VAL"
msgstr ""
-#: src/ypbind_server.c:314 src/ypbind_server.c:359
+#: src/ypbind_server.c:315 src/ypbind_server.c:360
#, c-format
msgid "User from '%s' try's to change the binding."
msgstr ""
-#: src/ypbind_server.c:326 src/ypbind_server.c:371
+#: src/ypbind_server.c:327 src/ypbind_server.c:372
msgid "Changing the binding is not allowed."
msgstr ""
-#: src/ypbind_server.c:333 src/ypbind_server.c:378
+#: src/ypbind_server.c:334 src/ypbind_server.c:379
msgid "SETDOM request doesn't come from reserved port."
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/src/Makefile.am
new/ypbind-mt-2.4/src/Makefile.am
--- old/ypbind-mt-2.2/src/Makefile.am 2014-12-04 14:51:52.000000000 +0100
+++ new/ypbind-mt-2.4/src/Makefile.am 2016-02-15 13:01:42.000000000 +0100
@@ -8,9 +8,10 @@
WARNFLAGS = @WARNFLAGS@
AM_CFLAGS = -D_REENTRANT=1 $(WARNFLAGS) -DLOCALEDIR=\"$(localedir)\" \
- @NIS_CFLAGS@ @TIRPC_CFLAGS@ -DUSE_SD_NOTIFY=@USE_SD_NOTIFY@
+ @NSL_CFLAGS@ @TIRPC_CFLAGS@ -DUSE_SD_NOTIFY=@USE_SD_NOTIFY@ \
+ -I$(srcdir)/../lib
# Disabled for now: @DBUS_CFLAGS@ @GLIB_CFLAGS@
-ypbind_LDADD = ../lib/libcompat.a @SYSTEMD_LIBS@ @NIS_LIBS@ @TIRPC_LIBS@
+ypbind_LDADD = ../lib/libcompat.a @SYSTEMD_LIBS@ @NSL_LIBS@ @TIRPC_LIBS@
# Disabled for now: @DBUS_LIBS@ @GLIB_LIBS@
CLEANFILES = *~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/src/Makefile.in
new/ypbind-mt-2.4/src/Makefile.in
--- old/ypbind-mt-2.2/src/Makefile.in 2014-12-04 14:53:31.000000000 +0100
+++ new/ypbind-mt-2.4/src/Makefile.in 2016-03-02 15:10:33.000000000 +0100
@@ -211,8 +211,8 @@
MSGFMT = @MSGFMT@
MSGFMT_015 = @MSGFMT_015@
MSGMERGE = @MSGMERGE@
-NIS_CFLAGS = @NIS_CFLAGS@
-NIS_LIBS = @NIS_LIBS@
+NSL_CFLAGS = @NSL_CFLAGS@
+NSL_LIBS = @NSL_LIBS@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -297,10 +297,11 @@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AM_CFLAGS = -D_REENTRANT=1 $(WARNFLAGS) -DLOCALEDIR=\"$(localedir)\" \
- @NIS_CFLAGS@ @TIRPC_CFLAGS@ -DUSE_SD_NOTIFY=@USE_SD_NOTIFY@
+ @NSL_CFLAGS@ @TIRPC_CFLAGS@ -DUSE_SD_NOTIFY=@USE_SD_NOTIFY@ \
+ -I$(srcdir)/../lib
# Disabled for now: @DBUS_CFLAGS@ @GLIB_CFLAGS@
-ypbind_LDADD = ../lib/libcompat.a @SYSTEMD_LIBS@ @NIS_LIBS@ @TIRPC_LIBS@
+ypbind_LDADD = ../lib/libcompat.a @SYSTEMD_LIBS@ @NSL_LIBS@ @TIRPC_LIBS@
# Disabled for now: @DBUS_LIBS@ @GLIB_LIBS@
CLEANFILES = *~
noinst_HEADERS = ypbind.h log_msg.h local.h pthread_np.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/src/serv_list.c
new/ypbind-mt-2.4/src/serv_list.c
--- old/ypbind-mt-2.2/src/serv_list.c 2014-12-04 15:24:12.000000000 +0100
+++ new/ypbind-mt-2.4/src/serv_list.c 2016-02-26 14:34:49.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2009, 2011, 2012, 2013, 2014 Thorsten Kukuk
+/* Copyright (c) 1998-2009, 2011, 2012, 2013, 2014, 2016 Thorsten Kukuk
This file is part of ypbind-mt.
Author: Thorsten Kukuk <ku...@suse.de>
@@ -36,6 +36,7 @@
#include <sys/socket.h>
#include "ypbind.h"
+#include "ypbind3_binding.h"
#include "log_msg.h"
#include "local.h"
#include "pthread_np.h"
@@ -124,6 +125,11 @@
}
else
{
+ if (ypb3->ypbind_servername)
+ log_msg (LOG_INFO, "Cannot convert '%s' to IPv4 address",
ypb3->ypbind_servername);
+ else
+ log_msg (LOG_INFO, "Don't have IPv4 address for bound host");
+
resp.ypbind_status = YPBIND_FAIL_VAL;
resp.ypbind2_error = YPBIND_ERR_NOSERV;
}
@@ -548,34 +554,29 @@
static bool_t
eachresult (bool_t *out, struct netbuf *nbuf, struct netconfig *nconf)
{
+ char namebuf6[INET6_ADDRSTRLEN];
+
if (*out)
{
struct ypbind3_binding ypb3;
if(debug_flag)
- {
- char namebuf6[INET6_ADDRSTRLEN];
-
- log_msg (LOG_DEBUG,
- _("Answer for domain '%s' from server '%s'"),
- in_use->domain, taddr2ipstr (nconf, nbuf,
- namebuf6, sizeof (namebuf6)));
- }
+ log_msg (LOG_DEBUG, _("Answer for domain '%s' from server '%s'"),
+ in_use->domain, taddr2ipstr (nconf, nbuf,
+ namebuf6, sizeof (namebuf6)));
if (!broken_server && (taddr2port (nconf, nbuf) >= IPPORT_RESERVED))
{
- char namebuf6[INET6_ADDRSTRLEN];
-
- log_msg (LOG_ERR,
+ log_msg (LOG_ERR,
_("Answer for domain '%s' from '%s' on illegal port %d."),
- in_use->domain, taddr2ipstr (nconf, nbuf,
- namebuf6, sizeof (namebuf6)),
+ in_use->domain, taddr2ipstr (nconf, nbuf, namebuf6,
+ sizeof (namebuf6)),
taddr2port (nconf, nbuf));
- return 0;
- }
-
+ return 0;
+ }
ypb3.ypbind_nconf = nconf;
ypb3.ypbind_svcaddr = nbuf;
- ypb3.ypbind_servername = '\0';
+ ypb3.ypbind_servername = (char *)taddr2ipstr (nconf, nbuf,
+ namebuf6, sizeof
(namebuf6));
ypb3.ypbind_hi_vers = YPVERS;
ypb3.ypbind_lo_vers = YPVERS;
in_use->other = __ypbind3_binding_dup (&ypb3);
@@ -630,7 +631,7 @@
status = rpc_broadcast (YPPROG, YPVERS, YPPROC_DOMAIN_NONACK,
(xdrproc_t) xdr_domainname, (caddr_t) &domain,
(xdrproc_t) xdr_bool, (caddr_t) &out,
- (resultproc_t) eachresult, "udp");
+ (resultproc_t) eachresult, "datagram_n");
if (status != RPC_SUCCESS)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ypbind-mt-2.2/src/ypbind_server.c
new/ypbind-mt-2.4/src/ypbind_server.c
--- old/ypbind-mt-2.2/src/ypbind_server.c 2014-11-03 15:45:42.000000000
+0100
+++ new/ypbind-mt-2.4/src/ypbind_server.c 2016-02-15 14:30:11.000000000
+0100
@@ -26,6 +26,7 @@
#include <arpa/inet.h>
#include "ypbind.h"
+#include "ypbind3_binding.h"
#include "log_msg.h"
#include "local.h"
++++++ ypbind-systemd-post ++++++
--- /var/tmp/diff_new_pack.Zu3kpS/_old 2016-04-11 10:27:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Zu3kpS/_new 2016-04-11 10:27:17.000000000 +0200
@@ -6,19 +6,20 @@
# to fix problems with the init scripts continuing even when
# we are really not bound yet to a server, and then things
# that need NIS fail.
+# Relax this test a little, wait some time, but don't abort
+# if we don't find a server, maybe it works later.
#
# Only check if we don't use NetworkManager
if [ "$YPBIND_DBUS" = "no" ]; then
notfound=1
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15; do
- ypwhich >/dev/null 2>&1 && { notfound=0 ; break; };
+ ypwhich &>/dev/null && { notfound=0 ; break; };
echo -n " ."
sleep 1;
done
if [ $notfound -eq 1 ]; then
echo -n " ${warn}No NIS server found${norm}";
- exit 1
fi
fi
exit 0
++++++ ypbind-systemd-pre ++++++
--- /var/tmp/diff_new_pack.Zu3kpS/_old 2016-04-11 10:27:17.000000000 +0200
+++ /var/tmp/diff_new_pack.Zu3kpS/_new 2016-04-11 10:27:17.000000000 +0200
@@ -13,13 +13,10 @@
}
if [ "x$DOMAINNAME" != 'x' ]; then
- echo "$DOMAINNAME"
- echo
+ echo "$DOMAINNAME\n"
domainname $DOMAINNAME
else
- echo
- echo "Error: NIS domain not specified."
- echo
+ echo "\nError: NIS domain not specified.\n"
exit 1
fi
fi
