Hello community,
here is the log from the commit of package ypbind for openSUSE:Factory checked in at 2012-03-29 07:50:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ypbind (Old)
and /work/SRC/openSUSE:Factory/.ypbind.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ypbind", Maintainer is "kukuk@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/ypbind/ypbind.changes 2012-02-27 18:38:49.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.ypbind.new/ypbind.changes 2012-03-29 07:50:14.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Mar 26 16:19:43 CEST 2012 - kukuk@suse.de
+
+- Update to ypbind-1.35 (bug fix release)
+
+-------------------------------------------------------------------
Old:
----
ypbind-mt-1.33.tar.bz2
ypbind-mt-update-networkmanager-interface-to-use-new-nm_state
New:
----
ypbind-mt-1.35.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ypbind.spec ++++++
--- /var/tmp/diff_new_pack.wBbPds/_old 2012-03-29 07:50:15.000000000 +0200
+++ /var/tmp/diff_new_pack.wBbPds/_new 2012-03-29 07:50:15.000000000 +0200
@@ -30,7 +30,7 @@
Requires: yp-tools
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 1.33
+Version: 1.35
Release: 0
Url: http://www.linux-nis.org/nis/ypbind-mt
Summary: NIS client daemon
@@ -38,8 +38,6 @@
Group: Productivity/Networking/NIS
Source: ftp://ftp.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
Source1: SuSEfirewall.ypbind
-#Patch: ypbind-mt-%{version}.diff
-Patch1: ypbind-mt-update-networkmanager-interface-to-use-new-nm_state
%description
This package provides the ypbind daemon. The ypbind daemon binds NIS
@@ -49,16 +47,8 @@
Ypbind must be running on any machines which are running NIS client
programs.
-
-
-Authors:
---------
- Thorsten Kukuk
-
%prep
%setup -q -n ypbind-mt-%{version}
-#%patch
-%patch1 -p1
%build
export CFLAGS=$RPM_OPT_FLAGS
++++++ ypbind-mt-1.33.tar.bz2 -> ypbind-mt-1.35.tar.bz2 ++++++
++++ 1649 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/COPYING new/ypbind-mt-1.35/COPYING
--- old/ypbind-mt-1.33/COPYING 2002-04-04 18:34:30.000000000 +0200
+++ new/ypbind-mt-1.35/COPYING 2011-08-31 15:13:21.000000000 +0200
@@ -2,7 +2,7 @@
Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -305,7 +305,7 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA
Also add information on how to contact you by electronic and paper mail.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/ChangeLog new/ypbind-mt-1.35/ChangeLog
--- old/ypbind-mt-1.33/ChangeLog 2011-04-29 16:33:49.000000000 +0200
+++ new/ypbind-mt-1.35/ChangeLog 2012-03-23 13:49:37.000000000 +0100
@@ -1,4 +1,33 @@
-2011-04-29 Thorsten Kukuk
+2012-03-23 Thorsten Kukuk
+
+ * release version 1.35
+
+ * src/ypbind_dbus_nm.c: Adjust to new NetworkManager [bnc#698030].
+ Patch by Jeff Mahoney .
+
+ * src/serv_list.c (remove_bindingfile): make sure
+ last.host is NULL.
+ Based on patch from Honza Horak .
+
+2011-08-31 Thorsten Kukuk
+
+ * release version 1.34
+
+ * src/serv_list.c: Fix memcpy usage.
+ Patch by Sebastian Koch .
+
+ * src/ypbind-mt.c: Add -n/-forground option for systemd.
+ * man/ypbind.8.xml: Document -n/-forground option.
+ Based on patch by Honza Horak .
+
+2011-08-31 Thorsten Kukuk
+
+ * Adjust FSF address.
+ Patch by Honza Horak
+
+2011-04-29 Thorsten Kukuk
+
+ * release version 1.33
* src/ypbind-mt.c (create_pidfile): return if no pidfile
could be created.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/NEWS new/ypbind-mt-1.35/NEWS
--- old/ypbind-mt-1.33/NEWS 2011-04-29 16:34:10.000000000 +0200
+++ new/ypbind-mt-1.35/NEWS 2012-03-23 13:45:48.000000000 +0100
@@ -1,9 +1,15 @@
ypbind-mt NEWS -- history of user-visible changes.
-Copyright (C) 1998-2011 Thorsten Kukuk
+Copyright (C) 1998-2012 Thorsten Kukuk
Please send bug reports, questions and suggestions to .
+Version 1.35
+* Fix problem with bindingfile handling
+
+Version 1.34
+* Add -forground option
+
Version 1.33
* Better error checking
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/configure.in new/ypbind-mt-1.35/configure.in
--- old/ypbind-mt-1.33/configure.in 2011-04-29 16:34:16.000000000 +0200
+++ new/ypbind-mt-1.35/configure.in 2012-03-23 13:37:49.000000000 +0100
@@ -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.33)
+AM_INIT_AUTOMAKE(ypbind-mt, 1.35)
AM_CONFIG_HEADER(config.h)
AC_PREFIX_DEFAULT(/usr)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/man/yp.conf.5 new/ypbind-mt-1.35/man/yp.conf.5
--- old/ypbind-mt-1.33/man/yp.conf.5 2010-07-07 14:29:38.000000000 +0200
+++ new/ypbind-mt-1.35/man/yp.conf.5 2011-08-31 15:26:02.000000000 +0200
@@ -1,12 +1,12 @@
.\" Title: yp.conf
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.74.0 http://docbook.sf.net/
-.\" Date: 07/07/2010
+.\" Date: 08/31/2011
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
.\" Language: English
.\"
-.TH "YP\&.CONF" "5" "07/07/2010" "ypbind-mt" "ypbind\-mt"
+.TH "YP\&.CONF" "5" "08/31/2011" "ypbind-mt" "ypbind\-mt"
.\" -----------------------------------------------------------------
.\" * (re)Define some macros
.\" -----------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/man/yp.conf.5.xml new/ypbind-mt-1.35/man/yp.conf.5.xml
--- old/ypbind-mt-1.33/man/yp.conf.5.xml 2006-10-04 17:26:28.000000000 +0200
+++ new/ypbind-mt-1.35/man/yp.conf.5.xml 2011-08-31 15:13:22.000000000 +0200
@@ -19,7 +19,7 @@
<!-- You should have received a copy of the GNU General Public -->
<!-- License along with ypbind\-mt; see the file COPYING. If not, -->
-<!-- write to the Free Software Foundation, Inc., 59 Temple Place \- Suite 330, -->
+<!-- write to the Free Software Foundation, Inc., 51 Franklin Street \- Suite 500, -->
<!-- Boston, MA 02111\-1307, USA. -->
<refentry id='ypconf5'>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/man/ypbind.8 new/ypbind-mt-1.35/man/ypbind.8
--- old/ypbind-mt-1.33/man/ypbind.8 2010-07-07 14:29:37.000000000 +0200
+++ new/ypbind-mt-1.35/man/ypbind.8 2011-08-31 15:26:32.000000000 +0200
@@ -1,12 +1,12 @@
.\" Title: ypbind
.\" Author: [see the "AUTHOR" section]
.\" Generator: DocBook XSL Stylesheets v1.74.0 http://docbook.sf.net/
-.\" Date: 07/07/2010
+.\" Date: 08/31/2011
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
.\" Language: English
.\"
-.TH "YPBIND" "8" "07/07/2010" "ypbind-mt" "ypbind\-mt"
+.TH "YPBIND" "8" "08/31/2011" "ypbind-mt" "ypbind\-mt"
.\" -----------------------------------------------------------------
.\" * (re)Define some macros
.\" -----------------------------------------------------------------
@@ -171,7 +171,7 @@
.SH "Synopsis"
.fam C
.HP \w'\fBypbind\fR\ 'u
-\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus]
+\fBypbind\fR [\-c] [\-d | \-debug] [\-verbose] [\-n | \-forground] [\-broadcast] [\-broken\-server] [\-ypset] [\-ypsetme] [\-no\-ping] [\-f\ \fIconfigfile\fR] [\-local\-only] [\-ping\-interval\ \fIping\-interval\fR] [\-no\-dbus]
.fam
.fam C
.HP \w'\fBypbind\fR\ 'u
@@ -292,6 +292,13 @@
will not put itself into background, and error messages and debug output are written to standard error\&.
.RE
.PP
+\fB\-foreground\fR
+.RS 4
+
+\fBypbind\fR
+will not put itself into backgroun\&.
+.RE
+.PP
\fB\-verbose\fR
.RS 4
Causes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/man/ypbind.8.xml new/ypbind-mt-1.35/man/ypbind.8.xml
--- old/ypbind-mt-1.33/man/ypbind.8.xml 2009-06-15 16:29:18.000000000 +0200
+++ new/ypbind-mt-1.35/man/ypbind.8.xml 2011-08-31 15:23:56.000000000 +0200
@@ -21,7 +21,7 @@
<!-- You should have received a copy of the GNU General Public -->
<!-- License along with ypbind\-mt; see the file COPYING. If not, -->
-<!-- write to the Free Software Foundation, Inc., 59 Temple Place \- Suite 330, -->
+<!-- write to the Free Software Foundation, Inc., 51 Franklin Street \- Suite 500, -->
<!-- Boston, MA 02111\-1307, USA. -->
<refentry id='ypbind8'>
@@ -42,6 +42,7 @@
<arg choice='opt'>-c </arg>
<group choice='opt'><arg choice='plain'>-d </arg><arg choice='plain'>-debug </arg></group>
<arg choice='opt'>-verbose </arg>
+ <group choice='opt'><arg choice='plain'>-n </arg><arg choice='plain'>-forground </arg></group>
<arg choice='opt'>-broadcast </arg>
<arg choice='opt'>-broken-server </arg>
<arg choice='opt'>-ypset </arg>
@@ -209,6 +210,14 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><option>-foreground</option></term>
+ <listitem>
+<para>
+<command>ypbind</command>
+will not put itself into backgroun.</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>-verbose</option></term>
<listitem>
<para>Causes
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/missing new/ypbind-mt-1.35/missing
--- old/ypbind-mt-1.33/missing 2002-04-04 18:34:34.000000000 +0200
+++ new/ypbind-mt-1.35/missing 2011-08-31 15:13:22.000000000 +0200
@@ -15,8 +15,8 @@
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Suite 500, Boston, MA
+# 02110-1335, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
Files old/ypbind-mt-1.33/po/de.gmo and new/ypbind-mt-1.35/po/de.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/po/de.po new/ypbind-mt-1.35/po/de.po
--- old/ypbind-mt-1.33/po/de.po 2011-04-29 16:34:50.000000000 +0200
+++ new/ypbind-mt-1.35/po/de.po 2011-08-31 15:54:07.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt\n"
"Report-Msgid-Bugs-To: kukuk@linux-nis.org\n"
-"POT-Creation-Date: 2011-04-29 16:34+0200\n"
+"POT-Creation-Date: 2011-08-31 15:54+0200\n"
"PO-Revision-Date: 2004-02-13 16:22+01:00\n"
"Last-Translator: Thorsten Kukuk \n"
"Language-Team: No Language-Team\n"
@@ -58,7 +58,7 @@
msgid "gethostbyname: Unknown error"
msgstr "gethostbyname: Unbekannter Fehler"
-#: src/serv_list.c:615 src/serv_list.c:925 src/serv_list.c:1044
+#: src/serv_list.c:615 src/serv_list.c:923 src/serv_list.c:1042
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr "Antwort f�r Domain \"%s\" vom Server \"%s\""
@@ -68,285 +68,285 @@
msgid "Answer for domain '%s' from unknown server '%s'"
msgstr "Antwort f�r Domain \"%s\" von unbekantem Server \"%s\""
-#: src/serv_list.c:626 src/serv_list.c:824
+#: src/serv_list.c:626 src/serv_list.c:822
#, 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:663
+#: src/serv_list.c:661
#, c-format
msgid "do_broadcast() for domain '%s' is called"
msgstr ""
-#: src/serv_list.c:698
+#: src/serv_list.c:696
#, c-format
msgid "leave do_broadcast() for domain '%s'"
msgstr ""
-#: src/serv_list.c:812 src/serv_list.c:984
+#: src/serv_list.c:810 src/serv_list.c:982
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr "Ping Host \"%s\", Domain \"%s\""
-#: src/serv_list.c:837
+#: src/serv_list.c:835
#, c-format
msgid "host '%s' doesn't answer."
msgstr "Server \"%s\" antwortet nicht."
-#: src/serv_list.c:908
+#: src/serv_list.c:906
#, fuzzy, c-format
msgid "Server '%s' for domain '%s' answered ping but failed to bind"
msgstr "Server \"%s\" f�r Domain \"%s\" antwortet nicht."
-#: src/serv_list.c:1003
+#: src/serv_list.c:1001
#, 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:1024
+#: src/serv_list.c:1022
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr "Domain \"%s\" wird nicht von \"%s\" unterst�tzt"
-#: src/serv_list.c:1146
+#: src/serv_list.c:1144
#, fuzzy
msgid "Pinging all active servers."
msgstr "Sende ein Ping zu allen aktiven Servern."
-#: src/serv_list.c:1148
+#: src/serv_list.c:1146
#, fuzzy
msgid "Checking for new fastest server."
msgstr "Suche erneut den schnellsten Server."
-#: src/serv_list.c:1160
+#: src/serv_list.c:1158
#, c-format
msgid "Requested domain %s, found %s, ignored."
msgstr ""
-#: src/ypbind-mt.c:161 src/ypbind-mt.c:164
+#: src/ypbind-mt.c:162 src/ypbind-mt.c:165
msgid "Trying entry:"
msgstr "Versuche Eintrag:"
-#: src/ypbind-mt.c:183
+#: src/ypbind-mt.c:184
#, c-format
msgid "parsed domain '%s' server '%s'"
msgstr "Parse domain '%s' server '%s'"
-#: src/ypbind-mt.c:199
+#: src/ypbind-mt.c:200
#, c-format
msgid "parsed domain '%s' broadcast"
msgstr "Parse domain '%s' broadcast"
-#: src/ypbind-mt.c:218
+#: src/ypbind-mt.c:219
#, c-format
msgid "parsed domain '%s' slp"
msgstr "Parse domain '%s' slp"
-#: src/ypbind-mt.c:241
+#: src/ypbind-mt.c:242
#, c-format
msgid "parsed ypserver %s"
msgstr "Parse ypserver %s"
-#: src/ypbind-mt.c:258
+#: src/ypbind-mt.c:259
msgid "parsed broadcast"
msgstr "Parse broadcast"
-#: src/ypbind-mt.c:267
+#: src/ypbind-mt.c:268
#, c-format
msgid "Entry \"%s\" is not valid!\n"
msgstr "Der Eintrag \"%s\" ist syntaktisch falsch!\n"
-#: src/ypbind-mt.c:271
+#: src/ypbind-mt.c:272
#, c-format
msgid "Entry \"%s\" is not valid, ignore it!"
msgstr "Der Eintrag \"%s\" ist syntaktisch falsch, er wird ignoriert!"
-#: src/ypbind-mt.c:282
+#: src/ypbind-mt.c:283
#, c-format
msgid "Bad entries found.\n"
msgstr "Ung�ltige Eintr�ge gefunden.\n"
-#: src/ypbind-mt.c:287
+#: src/ypbind-mt.c:288
#, c-format
msgid "No entry found.\n"
msgstr "Keinen Eintrag gefunden.\n"
-#: src/ypbind-mt.c:295
+#: src/ypbind-mt.c:296
msgid "No entry found."
msgstr "Keinen Eintrag gefunden."
-#: src/ypbind-mt.c:309
+#: src/ypbind-mt.c:310
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:312
+#: src/ypbind-mt.c:313
#, 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:314
+#: src/ypbind-mt.c:315
msgid "or start ypbind with the -broadcast option.\n"
msgstr "oder starte ypbind mit der -broadcast Option.\n"
-#: src/ypbind-mt.c:335
+#: src/ypbind-mt.c:336
#, c-format
msgid "cannot create pidfile %s"
msgstr "Kann Pidfile %s nicht erzeugen."
-#: src/ypbind-mt.c:365
+#: src/ypbind-mt.c:366
#, c-format
msgid "fcntl error: %s"
msgstr "fcntl Fehler: %s"
-#: src/ypbind-mt.c:377
+#: src/ypbind-mt.c:378
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr "ypbind-mt l�uft bereits (pid %d) - beende mich"
-#: src/ypbind-mt.c:388
+#: src/ypbind-mt.c:389
msgid "cannot lock pidfile"
msgstr "Kann Pidfile nicht locken"
-#: src/ypbind-mt.c:440
+#: src/ypbind-mt.c:441
#, c-format
msgid "sigwait failed: ret=%d."
msgstr ""
-#: src/ypbind-mt.c:446
+#: src/ypbind-mt.c:447
msgid "SIGCHLD arrived, what should I do ?"
msgstr "SIGCHLD abgefangen, was soll ich machen ?"
-#: src/ypbind-mt.c:454
+#: src/ypbind-mt.c:455
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr "Signal (%d) zum beenden des Programms bekommen."
-#: src/ypbind-mt.c:463
+#: src/ypbind-mt.c:464
msgid "cannot unlock pidfile"
msgstr "Kann Pidfile nicht unlocken."
-#: src/ypbind-mt.c:475
+#: src/ypbind-mt.c:476
msgid "SIGHUP arrived, reloading config file."
msgstr "SIGHUP abgefangen, Config Datei wird neu geladen."
-#: src/ypbind-mt.c:488
+#: src/ypbind-mt.c:489
msgid "Ignoring SIGPIPE."
msgstr ""
-#: src/ypbind-mt.c:491
+#: src/ypbind-mt.c:492
#, c-format
msgid "Unknown signal: %d"
msgstr "Unbekanntes Signal: %d"
-#: src/ypbind-mt.c:508
+#: src/ypbind-mt.c:509
msgid "Usage:\n"
msgstr "Aufruf:\n"
-#: src/ypbind-mt.c:509
+#: src/ypbind-mt.c:510
#, fuzzy
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n"
-"\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug] [-"
-"verbose]\n"
+"\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug]\n"
+"\t [-verbose] [-n | -foreground]\n"
msgstr ""
" ypbind [-broadcast | -ypset | -ypsetme] [-p Port] [-f "
"configfile] [-no-ping] [-broken-server] [-local-only] [-debug]\n"
-#: src/ypbind-mt.c:511
+#: src/ypbind-mt.c:512
msgid "\t [-no-dbus]\n"
msgstr ""
-#: src/ypbind-mt.c:513
+#: src/ypbind-mt.c:514
msgid "\typbind -c [-f configfile]\n"
msgstr ""
-#: src/ypbind-mt.c:514
+#: src/ypbind-mt.c:515
msgid "\typbind --version\n"
msgstr ""
-#: src/ypbind-mt.c:550
+#: src/ypbind-mt.c:551
#, c-format
msgid "Cannot create UDP: %s"
msgstr "Kann UDP Socket nicht erzeugen: %s"
-#: src/ypbind-mt.c:568
+#: src/ypbind-mt.c:569
#, c-format
msgid "Cannot bind UDP: %s"
msgstr ""
-#: src/ypbind-mt.c:578
+#: src/ypbind-mt.c:579
msgid "Cannot create udp service."
msgstr "Kann UDP Servie nicht erzeugen."
-#: src/ypbind-mt.c:587
+#: src/ypbind-mt.c:588
msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)."
msgstr "Kann (YPBINDPROG, YPBINDVERS, upd) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:596
+#: src/ypbind-mt.c:597
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)."
msgstr ""
"Kann (YPBINDPROG, YPBINDOLDVERS, udp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:606
+#: src/ypbind-mt.c:607
#, c-format
msgid "Cannot create TCP: %s"
msgstr "Kann TCP Socket nicht erzeugen: %s"
-#: src/ypbind-mt.c:625
+#: src/ypbind-mt.c:626
#, c-format
msgid "Cannot bind TCP: %s"
msgstr ""
-#: src/ypbind-mt.c:637
+#: src/ypbind-mt.c:638
msgid "Cannot create tcp service.\n"
msgstr "Kann TCP Service nicht erzeugen.\n"
-#: src/ypbind-mt.c:645
+#: src/ypbind-mt.c:646
msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)."
msgstr "Kann (YPBINDPROG, YPBINDVERS, tcp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:654
+#: src/ypbind-mt.c:655
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)."
msgstr ""
"Kann (YPBINDPROG, YPBINDOLDVERS, tcp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:755
+#: src/ypbind-mt.c:759
msgid "ERROR: domainname not set.\n"
msgstr "Fehler: Domainname wurde nicht gesetzt.\n"
-#: src/ypbind-mt.c:760
+#: src/ypbind-mt.c:764
msgid "domainname not set - aborting.\n"
msgstr "Domainname wurde nicht gesetzt - Abbruch.\n"
-#: src/ypbind-mt.c:769
+#: src/ypbind-mt.c:773
#, c-format
msgid "Config file %s is not ok.\n"
msgstr "Konfigurationsdatei %s ist nicht in Ordnung.\n"
-#: src/ypbind-mt.c:774
+#: src/ypbind-mt.c:778
#, c-format
msgid "Config file %s is ok.\n"
msgstr "Konfigurationsdatei %s ist in Ordnung.\n"
-#: src/ypbind-mt.c:781
+#: src/ypbind-mt.c:785
msgid "ypbind must be run as root\n"
msgstr "ypbind mu� als root gestartet werden.\n"
-#: src/ypbind-mt.c:789 src/ypbind-mt.c:798
+#: src/ypbind-mt.c:793 src/ypbind-mt.c:802
#, c-format
msgid "Could not create %s: %s\n"
msgstr "Kann %s nicht erzeugen: %s\n"
-#: src/ypbind-mt.c:805
+#: src/ypbind-mt.c:809
#, c-format
msgid "Could not change to directory %s: %s\n"
msgstr "Fehler beim Wechseln in das Verzeichnis %s: %s\n"
-#: src/ypbind-mt.c:903
+#: src/ypbind-mt.c:907
msgid "Could not block signals."
msgstr "Kann die Signale nicht blocken."
-#: src/ypbind-mt.c:951
+#: src/ypbind-mt.c:955
msgid "svc_run returned."
msgstr "svc_run hat sich beendet."
Files old/ypbind-mt-1.33/po/sv.gmo and new/ypbind-mt-1.35/po/sv.gmo differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/po/sv.po new/ypbind-mt-1.35/po/sv.po
--- old/ypbind-mt-1.33/po/sv.po 2011-04-29 16:34:51.000000000 +0200
+++ new/ypbind-mt-1.35/po/sv.po 2011-08-31 15:54:07.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt 1.20-2\n"
"Report-Msgid-Bugs-To: kukuk@linux-nis.org\n"
-"POT-Creation-Date: 2011-04-29 16:34+0200\n"
+"POT-Creation-Date: 2011-08-31 15:54+0200\n"
"PO-Revision-Date: 2006-11-12 16:48+0100\n"
"Last-Translator: Daniel Nylander \n"
"Language-Team: Swedish \n"
@@ -58,7 +58,7 @@
msgid "gethostbyname: Unknown error"
msgstr "gethostbyname: Ok�nt fel"
-#: src/serv_list.c:615 src/serv_list.c:925 src/serv_list.c:1044
+#: src/serv_list.c:615 src/serv_list.c:923 src/serv_list.c:1042
#, c-format
msgid "Answer for domain '%s' from server '%s'"
msgstr "Svar f�r dom�nen \"%s\" fr�n servern \"%s\""
@@ -68,282 +68,282 @@
msgid "Answer for domain '%s' from unknown server '%s'"
msgstr "Svar f�r dom�nen \"%s\" fr�n ok�nd server \"%s\""
-#: src/serv_list.c:626 src/serv_list.c:824
+#: src/serv_list.c:626 src/serv_list.c:822
#, 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:663
+#: src/serv_list.c:661
#, c-format
msgid "do_broadcast() for domain '%s' is called"
msgstr "do_broadcast() f�r dom�nen \"%s\" anropas"
-#: src/serv_list.c:698
+#: src/serv_list.c:696
#, c-format
msgid "leave do_broadcast() for domain '%s'"
msgstr "l�mna do_broadcast() f�r dom�nen \"%s\""
-#: src/serv_list.c:812 src/serv_list.c:984
+#: src/serv_list.c:810 src/serv_list.c:982
#, c-format
msgid "ping host '%s', domain '%s'"
msgstr "pinga v�rden \"%s\", dom�n \"%s\""
-#: src/serv_list.c:837
+#: src/serv_list.c:835
#, c-format
msgid "host '%s' doesn't answer."
msgstr "v�rden \"%s\" svarar inte."
-#: src/serv_list.c:908
+#: src/serv_list.c:906
#, c-format
msgid "Server '%s' for domain '%s' answered ping but failed to bind"
msgstr ""
"Servern \"%s\" f�r dom�nen \"%s\" svarade p� ping men misslyckades att binda"
-#: src/serv_list.c:1003
+#: src/serv_list.c:1001
#, 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:1024
+#: src/serv_list.c:1022
#, c-format
msgid "domain '%s' not served by '%s'"
msgstr "dom�nen \"%s\" hanteras inte av \"%s\""
-#: src/serv_list.c:1146
+#: src/serv_list.c:1144
msgid "Pinging all active servers."
msgstr "Pingar alla aktiva servrar."
-#: src/serv_list.c:1148
+#: src/serv_list.c:1146
msgid "Checking for new fastest server."
msgstr "Letar efter den snabbaste servern."
-#: src/serv_list.c:1160
+#: src/serv_list.c:1158
#, c-format
msgid "Requested domain %s, found %s, ignored."
msgstr "Beg�rd dom�n %s, hittade %s, ignoreras."
-#: src/ypbind-mt.c:161 src/ypbind-mt.c:164
+#: src/ypbind-mt.c:162 src/ypbind-mt.c:165
msgid "Trying entry:"
msgstr "F�rs�ker med posten:"
-#: src/ypbind-mt.c:183
+#: src/ypbind-mt.c:184
#, c-format
msgid "parsed domain '%s' server '%s'"
msgstr "tolkade dom�nen \"%s\" server \"%s\""
-#: src/ypbind-mt.c:199
+#: src/ypbind-mt.c:200
#, c-format
msgid "parsed domain '%s' broadcast"
msgstr "tolkade dom�nen \"%s\" broadcast"
-#: src/ypbind-mt.c:218
+#: src/ypbind-mt.c:219
#, c-format
msgid "parsed domain '%s' slp"
msgstr "tolkade dom�nen \"%s\" slp"
-#: src/ypbind-mt.c:241
+#: src/ypbind-mt.c:242
#, c-format
msgid "parsed ypserver %s"
msgstr "tolkade ypserver %s"
-#: src/ypbind-mt.c:258
+#: src/ypbind-mt.c:259
msgid "parsed broadcast"
msgstr "tolkade broadcast"
-#: src/ypbind-mt.c:267
+#: src/ypbind-mt.c:268
#, c-format
msgid "Entry \"%s\" is not valid!\n"
msgstr "Posten \"%s\" �r inte giltig!\n"
-#: src/ypbind-mt.c:271
+#: src/ypbind-mt.c:272
#, c-format
msgid "Entry \"%s\" is not valid, ignore it!"
msgstr "Posten \"%s\" �r inte giltig, ignorerar den!"
-#: src/ypbind-mt.c:282
+#: src/ypbind-mt.c:283
#, c-format
msgid "Bad entries found.\n"
msgstr "Felaktiga poster hittades.\n"
-#: src/ypbind-mt.c:287
+#: src/ypbind-mt.c:288
#, c-format
msgid "No entry found.\n"
msgstr "Ingen post hittades.\n"
-#: src/ypbind-mt.c:295
+#: src/ypbind-mt.c:296
msgid "No entry found."
msgstr "Ingen post hittades."
-#: src/ypbind-mt.c:309
+#: src/ypbind-mt.c:310
msgid "No NIS server and no -broadcast option specified.\n"
msgstr "Ingen NIS-server och flaggan -broadcast angavs inte.\n"
-#: src/ypbind-mt.c:312
+#: src/ypbind-mt.c:313
#, c-format
msgid "Add a NIS server to the %s configuration file,\n"
msgstr "L�gg till en NIS-server till konfigurationsfilen f�r %s,\n"
-#: src/ypbind-mt.c:314
+#: src/ypbind-mt.c:315
msgid "or start ypbind with the -broadcast option.\n"
msgstr "eller starta ypbind med flaggan -broadcast.\n"
-#: src/ypbind-mt.c:335
+#: src/ypbind-mt.c:336
#, c-format
msgid "cannot create pidfile %s"
msgstr "kan inte skapa pid-filen %s"
-#: src/ypbind-mt.c:365
+#: src/ypbind-mt.c:366
#, c-format
msgid "fcntl error: %s"
msgstr "fcntl-fel: %s"
-#: src/ypbind-mt.c:377
+#: src/ypbind-mt.c:378
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr "ypbind-mt k�r redan (pid %d) - avslutar"
-#: src/ypbind-mt.c:388
+#: src/ypbind-mt.c:389
msgid "cannot lock pidfile"
msgstr "kan inte l�sa pid-fil"
-#: src/ypbind-mt.c:440
+#: src/ypbind-mt.c:441
#, c-format
msgid "sigwait failed: ret=%d."
msgstr "sigwait misslyckades: ret=%d."
-#: src/ypbind-mt.c:446
+#: src/ypbind-mt.c:447
msgid "SIGCHLD arrived, what should I do ?"
msgstr "SIGCHLD togs emot, vad ska jag g�ra?"
-#: src/ypbind-mt.c:454
+#: src/ypbind-mt.c:455
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr "Signalen (%d) f�r programavslut togs emot."
-#: src/ypbind-mt.c:463
+#: src/ypbind-mt.c:464
msgid "cannot unlock pidfile"
msgstr "kan inte l�sa upp pid-fil"
-#: src/ypbind-mt.c:475
+#: src/ypbind-mt.c:476
msgid "SIGHUP arrived, reloading config file."
msgstr "SIGHUP togs emot, l�ser om konfigurationsfilen."
-#: src/ypbind-mt.c:488
+#: src/ypbind-mt.c:489
msgid "Ignoring SIGPIPE."
msgstr "Ignorerar SIGPIPE."
-#: src/ypbind-mt.c:491
+#: src/ypbind-mt.c:492
#, c-format
msgid "Unknown signal: %d"
msgstr "Ok�nd signal: %d"
-#: src/ypbind-mt.c:508
+#: src/ypbind-mt.c:509
msgid "Usage:\n"
msgstr "Anv�ndning:\n"
-#: src/ypbind-mt.c:509
+#: src/ypbind-mt.c:510
#, fuzzy
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n"
-"\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug] [-"
-"verbose]\n"
+"\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug]\n"
+"\t [-verbose] [-n | -foreground]\n"
msgstr ""
"\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f konfigurationsfil]\n"
"\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug]\n"
-#: src/ypbind-mt.c:511
+#: src/ypbind-mt.c:512
msgid "\t [-no-dbus]\n"
msgstr "\t [-no-dbus]\n"
-#: src/ypbind-mt.c:513
+#: src/ypbind-mt.c:514
msgid "\typbind -c [-f configfile]\n"
msgstr "\typbind -c [-f konfigurationsfil]\n"
-#: src/ypbind-mt.c:514
+#: src/ypbind-mt.c:515
msgid "\typbind --version\n"
msgstr "\typbind --version\n"
-#: src/ypbind-mt.c:550
+#: src/ypbind-mt.c:551
#, c-format
msgid "Cannot create UDP: %s"
msgstr "Kan inte skapa UDP: %s"
-#: src/ypbind-mt.c:568
+#: src/ypbind-mt.c:569
#, c-format
msgid "Cannot bind UDP: %s"
msgstr "Kan inte binda UDP: %s"
-#: src/ypbind-mt.c:578
+#: src/ypbind-mt.c:579
msgid "Cannot create udp service."
msgstr "Kan inte skapa udp-tj�nst."
-#: src/ypbind-mt.c:587
+#: src/ypbind-mt.c:588
msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, udp)."
-#: src/ypbind-mt.c:596
+#: src/ypbind-mt.c:597
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDOLDVERS, udp)."
-#: src/ypbind-mt.c:606
+#: src/ypbind-mt.c:607
#, c-format
msgid "Cannot create TCP: %s"
msgstr "Kan inte skapa TCP: %s"
-#: src/ypbind-mt.c:625
+#: src/ypbind-mt.c:626
#, c-format
msgid "Cannot bind TCP: %s"
msgstr "Kan inte binda TCP: %s"
-#: src/ypbind-mt.c:637
+#: src/ypbind-mt.c:638
msgid "Cannot create tcp service.\n"
msgstr "Kan inte skapa tcp-tj�nst.\n"
-#: src/ypbind-mt.c:645
+#: src/ypbind-mt.c:646
msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, tcp)."
-#: src/ypbind-mt.c:654
+#: src/ypbind-mt.c:655
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDOLDVERS, tcp)."
-#: src/ypbind-mt.c:755
+#: src/ypbind-mt.c:759
msgid "ERROR: domainname not set.\n"
msgstr "FEL: domainname inte inst�llt.\n"
-#: src/ypbind-mt.c:760
+#: src/ypbind-mt.c:764
msgid "domainname not set - aborting.\n"
msgstr "domainname inte inst�llt - avbryter.\n"
-#: src/ypbind-mt.c:769
+#: src/ypbind-mt.c:773
#, c-format
msgid "Config file %s is not ok.\n"
msgstr "Konfigurationsfilen %s �r inte ok.\n"
-#: src/ypbind-mt.c:774
+#: src/ypbind-mt.c:778
#, c-format
msgid "Config file %s is ok.\n"
msgstr "Konfigurationsfilen %s �r ok.\n"
-#: src/ypbind-mt.c:781
+#: src/ypbind-mt.c:785
msgid "ypbind must be run as root\n"
msgstr "ypbind m�ste k�ras som root\n"
-#: src/ypbind-mt.c:789 src/ypbind-mt.c:798
+#: src/ypbind-mt.c:793 src/ypbind-mt.c:802
#, c-format
msgid "Could not create %s: %s\n"
msgstr "Kunde inte skapa %s: %s\n"
-#: src/ypbind-mt.c:805
+#: src/ypbind-mt.c:809
#, c-format
msgid "Could not change to directory %s: %s\n"
msgstr "Kunde inte �ndra till katalogen %s: %s\n"
-#: src/ypbind-mt.c:903
+#: src/ypbind-mt.c:907
msgid "Could not block signals."
msgstr "Kunde inte blockera signaler."
-#: src/ypbind-mt.c:951
+#: src/ypbind-mt.c:955
msgid "svc_run returned."
msgstr "svc_run �terv�nde."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/log_msg.c new/ypbind-mt-1.35/src/log_msg.c
--- old/ypbind-mt-1.33/src/log_msg.c 2009-05-18 12:36:37.000000000 +0200
+++ new/ypbind-mt-1.35/src/log_msg.c 2011-08-31 15:13:22.000000000 +0200
@@ -13,8 +13,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/pthread_np.c new/ypbind-mt-1.35/src/pthread_np.c
--- old/ypbind-mt-1.33/src/pthread_np.c 2000-09-25 20:20:26.000000000 +0200
+++ new/ypbind-mt-1.35/src/pthread_np.c 2011-08-31 15:13:22.000000000 +0200
@@ -15,8 +15,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#include
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/pthread_np.h new/ypbind-mt-1.35/src/pthread_np.h
--- old/ypbind-mt-1.33/src/pthread_np.h 1999-05-14 21:05:13.000000000 +0200
+++ new/ypbind-mt-1.35/src/pthread_np.h 2011-08-31 15:13:22.000000000 +0200
@@ -16,8 +16,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#ifndef _PTHREAD_NP_H
#define _PTHREAD_NP_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/serv_list.c new/ypbind-mt-1.35/src/serv_list.c
--- old/ypbind-mt-1.33/src/serv_list.c 2011-04-29 16:15:48.000000000 +0200
+++ new/ypbind-mt-1.35/src/serv_list.c 2012-03-23 13:29:23.000000000 +0100
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998-2009, 2011 Thorsten Kukuk
+/* Copyright (c) 1998-2009, 2011, 2012 Thorsten Kukuk
This file is part of ypbind-mt.
Author: Thorsten Kukuk
@@ -13,8 +13,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#define _GNU_SOURCE
@@ -109,10 +109,14 @@
static int ping_all (struct binding *list);
static void
-remove_bindingfile (const char *domain_name)
+remove_bindingfile (struct binding *entry)
{
+ const char *domain_name = entry->domain;
char path[strlen (BINDINGDIR) + strlen (domain_name) + 10];
+ /* We want to re-create binding files after binding is OK again */
+ entry->last.host = NULL;
+
sprintf (path, "%s/%s.1", BINDINGDIR, domain_name);
unlink (path);
sprintf (path, "%s/%s.2", BINDINGDIR, domain_name);
@@ -375,7 +379,7 @@
{
if (domainlist[i].active != -1)
{
- remove_bindingfile (domainlist[i].domain);
+ remove_bindingfile (&domainlist[i]);
for (j = 0; j < _MAXSERVER; ++j)
{
if (domainlist[i].server[j].host != NULL)
@@ -629,11 +633,9 @@
return 0;
}
- memcpy(&(in_use->server[0].addr), &addr->sin_addr,
- sizeof (struct in_addr));
- memcpy(&(in_use->server[0].port), &addr->sin_port,
- sizeof (unsigned short int));
- memcpy (&(in_use->sin), &addr, sizeof (struct sockaddr_in));
+ in_use->server[0].addr = addr->sin_addr;
+ in_use->server[0].port = addr->sin_port;
+ in_use->sin = *addr;
in_use->active = 0;
@@ -686,7 +688,7 @@
if (status != RPC_SUCCESS)
{
- remove_bindingfile (domain);
+ remove_bindingfile (list);
log_msg (LOG_ERR, "broadcast: %s.", clnt_sperrno (status));
}
else
@@ -950,7 +952,7 @@
free (pings);
if (!found)
- remove_bindingfile (list->domain);
+ remove_bindingfile (list);
return found;
}
@@ -1062,7 +1064,7 @@
++i;
if (i == _MAXSERVER)
{
- remove_bindingfile(list->domain);
+ remove_bindingfile(list);
return 0;
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/ypbind-mt.c new/ypbind-mt-1.35/src/ypbind-mt.c
--- old/ypbind-mt-1.33/src/ypbind-mt.c 2011-04-29 16:33:11.000000000 +0200
+++ new/ypbind-mt-1.35/src/ypbind-mt.c 2011-08-31 15:21:11.000000000 +0200
@@ -13,8 +13,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#define _GNU_SOURCE /* for GLIBC */
#define _POSIX_PTHREAD_SEMANTICS /* for Solaris threads */
@@ -71,6 +71,7 @@
int ypset = SET_NO;
int use_broadcast = 0;
int broken_server = 0;
+int foreground_flag = 0;
int ping_interval = 20;
int local_only = 0;
int port = -1;
@@ -506,7 +507,7 @@
output = stdout;
fputs (_("Usage:\n"), output);
- fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug] [-verbose]\n"), output);
+ fputs (_("\typbind [-broadcast | -ypset | -ypsetme] [-f configfile]\n\t [-no-ping] [-broken-server] [-local-only] [-i ping-interval] [-debug]\n\t [-verbose] [-n | -foreground]\n"), output);
#ifdef USE_DBUS_NM
fputs (_("\t [-no-dbus]\n"), output);
#endif
@@ -691,6 +692,9 @@
else if (strcmp ("-d", argv[i]) == 0 ||
strcmp ("-debug", argv[i]) == 0)
debug_flag = 1;
+ else if (strcmp ("-n", argv[i]) == 0 ||
+ strcmp ("-foreground", argv[i]) == 0)
+ foreground_flag = 1;
else if (strcmp ("-v", argv[i]) == 0 ||
strcmp ("-verbose", argv[i]) == 0)
verbose_flag = 1;
@@ -833,7 +837,7 @@
log_msg (LOG_DEBUG, "[Welcome to ypbind-mt, version %s]\n", VERSION);
log_msg (LOG_DEBUG, "ping interval is %d seconds\n", ping_interval);
}
- else
+ else if (! foreground_flag)
{
int j;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/ypbind.h new/ypbind-mt-1.35/src/ypbind.h
--- old/ypbind-mt-1.33/src/ypbind.h 2001-10-27 22:24:36.000000000 +0200
+++ new/ypbind-mt-1.35/src/ypbind.h 2011-08-31 15:13:22.000000000 +0200
@@ -13,8 +13,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#ifndef __YPBIND_H__
#define __YPBIND_H__
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/ypbind_dbus_nm.c new/ypbind-mt-1.35/src/ypbind_dbus_nm.c
--- old/ypbind-mt-1.33/src/ypbind_dbus_nm.c 2010-07-07 14:27:26.000000000 +0200
+++ new/ypbind-mt-1.35/src/ypbind_dbus_nm.c 2012-03-23 13:48:21.000000000 +0100
@@ -13,8 +13,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#if defined(HAVE_CONFIG_H)
#include "config.h"
@@ -42,12 +42,16 @@
#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
typedef enum NMState {
- NM_STATE_UNKNOWN = 0,
- NM_STATE_ASLEEP,
- NM_STATE_CONNECTING,
- NM_STATE_CONNECTED,
- NM_STATE_DISCONNECTED
+ NM_STATE_UNKNOWN = 0,
+ NM_STATE_ASLEEP = 10,
+ NM_STATE_DISCONNECTED = 20,
+ NM_STATE_DISCONNECTING = 30,
+ NM_STATE_CONNECTING = 40,
+ NM_STATE_CONNECTED_LOCAL = 50,
+ NM_STATE_CONNECTED_SITE = 60,
+ NM_STATE_CONNECTED_GLOBAL = 70
} NMState;
+#define NM_STATE_CONNECTED NM_STATE_CONNECTED_GLOBAL
#endif
@@ -133,6 +137,12 @@
return !status;
}
+static int is_connected_state(NMState state) {
+ return (state == NM_STATE_CONNECTED_LOCAL ||
+ state == NM_STATE_CONNECTED_SITE ||
+ state == NM_STATE_CONNECTED_GLOBAL);
+}
+
static DBusHandlerResult
dbus_filter (DBusConnection *connection,
DBusMessage *message, void *user_data __attribute__((unused)))
@@ -157,7 +167,7 @@
if (dbus_message_get_args (message, NULL, DBUS_TYPE_UINT32,
&state, DBUS_TYPE_INVALID))
{
- if (state == NM_STATE_CONNECTED)
+ if (is_connected_state(state))
go_online ();
else if (state == NM_STATE_DISCONNECTED)
go_offline ();
@@ -239,7 +249,7 @@
DBUS_TYPE_INVALID))
return -1;
- if (state != NM_STATE_CONNECTED)
+ if (!is_connected_state(state))
return 0;
return 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/ypbind_server.c new/ypbind-mt-1.35/src/ypbind_server.c
--- old/ypbind-mt-1.33/src/ypbind_server.c 2009-05-18 17:14:58.000000000 +0200
+++ new/ypbind-mt-1.35/src/ypbind_server.c 2011-08-31 15:13:22.000000000 +0200
@@ -13,8 +13,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#if defined(HAVE_CONFIG_H)
#include "config.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/ypbind-mt-1.33/src/ypbind_slp.c new/ypbind-mt-1.35/src/ypbind_slp.c
--- old/ypbind-mt-1.33/src/ypbind_slp.c 2004-04-29 14:47:43.000000000 +0200
+++ new/ypbind-mt-1.35/src/ypbind_slp.c 2011-08-31 15:13:22.000000000 +0200
@@ -13,8 +13,8 @@
You should have received a copy of the GNU General Public
License along with ypbind-mt; see the file COPYING. If not,
- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA. */
+ write to the Free Software Foundation, Inc., 51 Franklin Street - Suite 500,
+ Boston, MA 02110-1335, USA. */
#if defined(HAVE_CONFIG_H)
#include "config.h"
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org