Mailinglist Archive: opensuse-commit (783 mails)
| < Previous | Next > |
commit ypbind for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Wed, 01 Apr 2009 18:38:41 +0200
- Message-id: <20090401163841.8B8C767807A@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package ypbind for openSUSE:Factory
checked in at Wed Apr 1 18:38:41 CEST 2009.
--------
--- ypbind/ypbind.changes 2008-08-28 16:20:07.000000000 +0200
+++ ypbind/ypbind.changes 2009-03-30 13:50:21.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Mar 30 13:50:06 CEST 2009 - kukuk@xxxxxxx
+
+- Update to 1.23: Improvements in NetworkManager support
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
ypbind-mt-1.22.tar.bz2
New:
----
ypbind-mt-1.23.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ypbind.spec ++++++
--- /var/tmp/diff_new_pack.ty8277/_old 2009-04-01 18:37:55.000000000 +0200
+++ /var/tmp/diff_new_pack.ty8277/_new 2009-04-01 18:37:55.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package ypbind (Version 1.22)
+# spec file for package ypbind (Version 1.23)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -29,7 +29,7 @@
AutoReqProv: on
PreReq: %insserv_prereq %fillup_prereq
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Version: 1.22
+Version: 1.23
Release: 1
Url: http://www.linux-nis.org/nis/ypbind-mt
Summary: NIS client daemon
@@ -115,6 +115,8 @@
%dir /var/yp/binding
%changelog
+* Mon Mar 30 2009 kukuk@xxxxxxx
+- Update to 1.23: Improvements in NetworkManager support
* Thu Aug 28 2008 kukuk@xxxxxxx
- Update to 1.22:
- Merge Patches
@@ -184,7 +186,7 @@
- Use new stop_on_removal/restart_on_upate macros
* Tue Jul 29 2003 kukuk@xxxxxxx
- Fix postun/preun scripts
-* Tue Jul 29 2003 kukuk@xxxxxxx
+* Mon Jul 28 2003 kukuk@xxxxxxx
- Don't remove binding files on update
- Stop daemon on uninstall
- Restart daemon on update
++++++ ypbind-mt-1.22.tar.bz2 -> ypbind-mt-1.23.tar.bz2 ++++++
++++ 8499 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.22/ChangeLog new/ypbind-mt-1.23/ChangeLog
--- old/ypbind-mt-1.22/ChangeLog 2008-08-28 14:25:17.000000000 +0200
+++ new/ypbind-mt-1.23/ChangeLog 2009-03-30 14:23:37.000000000 +0200
@@ -1,3 +1,19 @@
+2009-03-30 Thorsten Kukuk <kukuk@xxxxxxx>
+
+ * release version 1.23
+
+ * src/ypbind-mt.c (main): Fix last patch for the case that
+ we don't use NetworkManager and have already a network.
+
+ * etc/ypbind.init: Don't initialise domainname,
+ should be done by network scripts.
+ Don't check for working ypbind if we use NetworkManager.
+
+2009-03-30 Chris Burghart <burghart@xxxxxxxx>
+
+ * src/ypbind_dbus_nm.c: Use always go_online().
+ * src/ypbind-mt.c: Add load_config_or_exit().
+
2008-08-28 Thorsten Kukuk <kukuk@xxxxxxx>
* release version 1.22
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.22/configure.in new/ypbind-mt-1.23/configure.in
--- old/ypbind-mt-1.22/configure.in 2008-08-28 14:25:45.000000000 +0200
+++ new/ypbind-mt-1.23/configure.in 2009-03-30 13:01:48.000000000 +0200
@@ -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.22)
+AM_INIT_AUTOMAKE(ypbind-mt, 1.23)
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.22/etc/ypbind.init new/ypbind-mt-1.23/etc/ypbind.init
--- old/ypbind-mt-1.22/etc/ypbind.init 2008-08-27 17:34:49.000000000 +0200
+++ new/ypbind-mt-1.23/etc/ypbind.init 2009-03-30 14:15:07.000000000 +0200
@@ -1,5 +1,5 @@
#! /bin/sh
-# Copyright (c) 2004, 2008 Author: Thorsten Kukuk <kukuk@xxxxxxx>
+# Copyright (c) 2004, 2008, 2009 Author: Thorsten Kukuk <kukuk@xxxxxxx>
#
# /etc/init.d/ypbind
#
@@ -55,25 +55,6 @@
case "$1" in
start)
echo -n "Starting ypbind"
- ## If the domainname is not set, skip starting of ypbind
- ## and return with "program not configured"
- /bin/ypdomainname &> /dev/null
- if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
- if [ -f /etc/defaultdomain ]; then
- XDOMAINNAME=`cat /etc/defaultdomain`
- /bin/ypdomainname "$XDOMAINNAME"
- fi
- /bin/ypdomainname &> /dev/null
- if [ $? -ne 0 -o -z "`/bin/ypdomainname 2>/dev/null`" ]; then
- # Tell the user this has skipped
- echo -n " . . . . . . . . . . No domainname set"
- rc_status -s
- # service is not configured
- rc_failed 6
- rc_exit
- fi
- fi
-
## If we don't have a /etc/yp.conf file, skip starting of
## ypbind and return with "program not configured"
## if you add the -broadcast Option later, comment this out.
@@ -86,21 +67,6 @@
rc_exit
fi
- ## Check if portmap or rpcbind is running, else abort with error
- portmap_found=0
- for prog in /sbin/rpcbind /sbin/portmap ; do
- test -x $prog && checkproc $prog
- if [ $? -eq 0 ]; then
- portmap_found=1
- fi
- done
- if [ $portmap_found -eq 0 ]; then
- echo -n " . . . . . . . . . . ${attn}No portmapper running${norm}"
- rc_failed
- rc_status -v
- rc_exit
- fi
-
# evaluate the OPTIONS for ypbind-mt
OPTIONS=""
test "$YPBIND_VERBOSE" = "yes" && OPTIONS="-verbose $OPTIONS"
@@ -111,18 +77,22 @@
test "$YPBIND_DBUS" = "no" && OPTIONS="-no-dbus $OPTIONS"
startproc $YPBIND_BIN $YPBIND_OPTIONS $OPTIONS
- if [ $? -eq 0 ]; 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 && { notfound=0 ; break; };
- echo -n " ."
- sleep 1;
- done
- if [ $notfound -eq 1 ]; then
- echo -n " ${warn}No NIS server found${norm}";
- fi
- else
- rc_failed
+ RETVAL=$?
+ if [ "$YPBIND_DBUS" = "no" ]; then
+ # Only check if we don't use NetworkManager
+ if [ $? -eq 0 ]; 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 && { notfound=0 ; break; };
+ echo -n " ."
+ sleep 1;
+ done
+ if [ $notfound -eq 1 ]; then
+ echo -n " ${warn}No NIS server found${norm}";
+ fi
+ else
+ rc_failed
+ fi
fi
rc_status -v
;;
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.22/man/ypbind.8 new/ypbind-mt-1.23/man/ypbind.8
--- old/ypbind-mt-1.22/man/ypbind.8 2008-08-28 14:40:14.000000000 +0200
+++ new/ypbind-mt-1.23/man/ypbind.8 2009-03-30 13:42:12.000000000 +0200
@@ -1,100 +1,260 @@
.\" Title: ypbind
-.\" Author:
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\" Date: 08/28/2008
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+.\" Date: 03/30/2009
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
+.\" Language: English
.\"
-.TH "YPBIND" "8" "08/28/2008" "ypbind-mt" "ypbind\-mt"
+.TH "YPBIND" "8" "03/30/2009" "ypbind-mt" "ypbind\-mt"
+.\" -----------------------------------------------------------------
+.\" * (re)Define some macros
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" toupper - uppercase a string (locale-aware)
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de toupper
+.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+\\$*
+.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SH-xref - format a cross-reference to an SH section
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de SH-xref
+.ie n \{\
+.\}
+.toupper \\$*
+.el \{\
+\\$*
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SH - level-one heading that works better for non-TTY output
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de1 SH
+.\" put an extra blank line of space above the head in non-TTY output
+.if t \{\
+.sp 1
+.\}
+.sp \\n[PD]u
+.nr an-level 1
+.set-an-margin
+.nr an-prevailing-indent \\n[IN]
+.fi
+.in \\n[an-margin]u
+.ti 0
+.HTML-TAG ".NH \\n[an-level]"
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+\." make the size of the head bigger
+.ps +3
+.ft B
+.ne (2v + 1u)
+.ie n \{\
+.\" if n (TTY output), use uppercase
+.toupper \\$*
+.\}
+.el \{\
+.nr an-break-flag 0
+.\" if not n (not TTY), use normal case (not uppercase)
+\\$1
+.in \\n[an-margin]u
+.ti 0
+.\" if not n (not TTY), put a border/line under subheading
+.sp -.6
+\l'\n(.lu'
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SS - level-two heading that works better for non-TTY output
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de1 SS
+.sp \\n[PD]u
+.nr an-level 1
+.set-an-margin
+.nr an-prevailing-indent \\n[IN]
+.fi
+.in \\n[IN]u
+.ti \\n[SN]u
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.ps \\n[PS-SS]u
+\." make the size of the head bigger
+.ps +2
+.ft B
+.ne (2v + 1u)
+.if \\n[.$] \&\\$*
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BB/BE - put background/screen (filled box) around block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BB
+.if t \{\
+.sp -.5
+.br
+.in +2n
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EB
+.if t \{\
+.if "\\$2"adjust-for-leading-newline" \{\
+.sp -1
+.\}
+.br
+.di
+.in
+.ll
+.gcolor
+.nr BW \\n(.lu-\\n(.i
+.nr BH \\n(dn+.5v
+.ne \\n(BHu+.5v
+.ie "\\$2"adjust-for-leading-newline" \{\
+\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.el \{\
+\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.in 0
+.sp -.5v
+.nf
+.BX
+.in
+.sp .5v
+.fi
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BM/EM - put colored marker in margin next to block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BM
+.if t \{\
+.br
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EM
+.if t \{\
+.br
+.di
+.ll
+.gcolor
+.nr BH \\n(dn
+.ne \\n(BHu
+\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+.in 0
+.nf
+.BX
+.in
+.fi
+.\}
+..
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
-.SH "NAME"
-ypbind - NIS binding process
-.SH "SYNOPSIS"
-.HP 7
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "Name"
+ypbind \- NIS binding process
+.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]
-.HP 7
+.fam
+.fam C
+.HP \w'\fBypbind\fR\ 'u
\fBypbind\fR \-\-version
+.fam
.SH "DESCRIPTION"
.PP
\fBypbind\fR
-finds the server for NIS domains and maintains the NIS binding information\.
The client (normaly the NIS routines in the standard C library) could get the
information over RPC from
+finds the server for NIS domains and maintains the NIS binding information\&.
The client (normaly the NIS routines in the standard C library) could get the
information over RPC from
\fBypbind\fR
-or read the binding files\. The binding files resides in the directory
-\fI/var/yp/binding\fR
+or read the binding files\&. The binding files resides in the directory
+\FC/var/yp/binding\F[]
and are conventionally named
-\fB[domainname]\.[version]\fR\. The supported versions are 1 and 2\. There
could be several such files since it is possible for an NIS client to be bound
to more than one domain\.
+\fB[domainname]\&.[version]\fR\&. The supported versions are 1 and 2\&. There
could be several such files since it is possible for an NIS client to be bound
to more than one domain\&.
.PP
After a binding has been established,
\fBypbind\fR
-will send YPPROC_DOMAIN requests to the current NIS server at 20 seconds
intervals\. If it doesn\'t get an response or the NIS server reports that he
doesn\'t have this domain any longer,
+will send YPPROC_DOMAIN requests to the current NIS server at 20 seconds
intervals\&. If it doesn\'t get an response or the NIS server reports that he
doesn\'t have this domain any longer,
\fBypbind\fR
-will search for a new NIS server\. All 15 minutes
+will search for a new NIS server\&. All 15 minutes
\fBypbind\fR
-will check to see if the current NIS server is the fastest\. If it find a
server which answers faster, it will switch to this server\. You could tell
+will check to see if the current NIS server is the fastest\&. If it find a
server which answers faster, it will switch to this server\&. You could tell
\fBypbind\fR
-to use network broadcasts to find a new server, what is insecure, or you could
give it a list of known secure servers\. In this case
+to use network broadcasts to find a new server, what is insecure, or you could
give it a list of known secure servers\&. In this case
\fBypbind\fR
-will send a ping to all servers and binds to first one which answers\.
+will send a ping to all servers and binds to first one which answers\&.
.PP
Unless the option
\fB\-debug\fR
-is used, ypbind detaches itself from the controlling terminal and puts itself
into background\.
+is used, ypbind detaches itself from the controlling terminal and puts itself
into background\&.
\fBypbind\fR
uses
\fBsyslog\fR(3)
-for logging errors and warnings\. At startup or when receiving signal SIGHUP,
+for logging errors and warnings\&. At startup or when receiving signal SIGHUP,
\fBypbind\fR
parses the file
-\fI/etc/yp\.conf\fR
-and tries to use the entries for its initial binding\.
+\FC/etc/yp\&.conf\F[]
+and tries to use the entries for its initial binding\&.
.PP
-A broadcast entry in the configuration file will overwrite a ypserver/server
entry and a ypserver/server entry broadcast\. If all given server are down,
+A broadcast entry in the configuration file will overwrite a ypserver/server
entry and a ypserver/server entry broadcast\&. If all given server are down,
\fBypbind\fR
will
\fBnot\fR
-switch to use broadcast\.
+switch to use broadcast\&.
\fBypbind\fR
will try at first
-\fI/etc/hosts\fR
+\FC/etc/hosts\F[]
and then
\fBDNS\fR
for resolving the hosts names from
-\fI/etc/yp\.conf\fR\. If
+\FC/etc/yp\&.conf\F[]\&. If
\fBypbind\fR
couldn\'t reconfigure the search order, it will use only
-\fBDNS\fR\. If
+\fBDNS\fR\&. If
\fBDNS\fR
isn\'t available, you could only use IP\-addresses in
-\fI/etc/hosts\fR\.
+\FC/etc/hosts\F[]\&.
\fBypbind\fR
-could only reconfigure the search order with glibc 2\.x\. If the
+could only reconfigure the search order with glibc 2\&.x\&. If the
\fB\-broadcast\fR
option is specified,
\fBypbind\fR
-will ignore the configuration file\. If the file does not exist or if there
are no valid entries,
+will ignore the configuration file\&. If the file does not exist or if there
are no valid entries,
\fBypbind\fR
-exit\.
+exit\&.
.PP
This
\fBypbind\fR
-version listens for DBUS messages from NetworkManager\. If no NetworkManager
is running at startup,
+version listens for DBUS messages from NetworkManager\&. If no NetworkManager
is running at startup,
\fBypbind\fR
-will behave as usual and assumes there is a working network connection\. If
NetworkManager is running on the system, ypbind will only search and providde
NIS informations, if NetworkManager tells that a network connection is
available\. If NetworkManager establishes a connection,
+will behave as usual and assumes there is a working network connection\&. If
NetworkManager is running on the system, ypbind will only search and providde
NIS informations, if NetworkManager tells that a network connection is
available\&. If NetworkManager establishes a connection,
\fBypbind\fR
-will reread all configuration files, registers at the local portmapper and try
to search NIS servers\. If NetworkManager drops a connection,
+will reread all configuration files, registers at the local portmapper and try
to search NIS servers\&. If NetworkManager drops a connection,
\fBypbind\fR
-will unregister from portmapper\.
+will unregister from portmapper\&.
.SH "OPTIONS"
.PP
\fB\-broadcast\fR
.RS 4
-Send a broadcast to request the information needed to bind to a specific NIS
server\. With this option,
-\fI/etc/yp\.conf\fR
-will be ignored\.
+Send a broadcast to request the information needed to bind to a specific NIS
server\&. With this option,
+\FC/etc/yp\&.conf\F[]
+will be ignored\&.
.RE
.PP
\fB\-ypset\fR
@@ -103,9 +263,9 @@
\fBroot\fR
from any remote machine to change the binding for a domain via the
\fBypset\fR(8)
-command\. By default, no one can change the binding\. This option is really
insecure\. If you change a binding for a domain, all the current known servers
for this domain will be forgotten\. If the new server goes down,
+command\&. By default, no one can change the binding\&. This option is really
insecure\&. If you change a binding for a domain, all the current known servers
for this domain will be forgotten\&. If the new server goes down,
\fBypbind\fR
-will use the old searchlist\.
+will use the old searchlist\&.
.RE
.PP
\fB\-ypsetme\fR
@@ -113,47 +273,47 @@
The same as
\fB\-ypset\fR, but only
\fBroot\fR
-on the local machine is allowed to chang the binding\. Such requests are only
allowd from
-\fBloopback\fR\.
+on the local machine is allowed to chang the binding\&. Such requests are only
allowd from
+\fBloopback\fR\&.
.RE
.PP
\fB\-c\fR
.RS 4
\fBypbind\fR
-only checks if the config file has syntax errors and exits\.
+only checks if the config file has syntax errors and exits\&.
.RE
.PP
\fB\-debug\fR
.RS 4
starts
\fBypbind\fR
-in debug mode\.
+in debug mode\&.
\fBypbind\fR
-will not put itself into background, and error messages and debug output are
written to standard error\.
+will not put itself into background, and error messages and debug output are
written to standard error\&.
.RE
.PP
\fB\-verbose\fR
.RS 4
Causes
\fBypbind\fR
-to syslog(2) any and all changes in the server its bound to\.
+to syslog(2) any and all changes in the server its bound to\&.
.RE
.PP
\fB\-broken\-server\fR
.RS 4
lets
\fBypbind\fR
-accept answers from servers running on an illegal port number\. This should
usually be avoided, but is required by some
+accept answers from servers running on an illegal port number\&. This should
usually be avoided, but is required by some
\fBypserv\fR(8)
-versions\.
+versions\&.
.RE
.PP
\fB\-no\-ping\fR
.RS 4
\fBypbind\fR
-will not check if the binding is alive\. This option is for use with dialup
connections to prevent
+will not check if the binding is alive\&. This option is for use with dialup
connections to prevent
\fBypbind\fR
-from keeping the connection unnessecarily open or causing autodials\.
+from keeping the connection unnessecarily open or causing autodials\&.
.RE
.PP
\fB\-f\fR configfile
@@ -162,25 +322,25 @@
will use
\fBconfigfile\fR
and not
-\fI/etc/yp\.conf\fR
+\FC/etc/yp\&.conf\F[]
.RE
.PP
\fB\-local\-only\fR
.RS 4
\fBypbind\fR
-will only bind to the loopback device and is not reacheable from a remote
network\.
+will only bind to the loopback device and is not reacheable from a remote
network\&.
.RE
.PP
\fB\-ping\-interval\fR ping\-interval
.RS 4
The default value for
\fBypbind\fR
-to check, if a NIS server is still reacheable, is 20 seconds\. With this
options another frequency in seconds can be specified\.
+to check, if a NIS server is still reacheable, is 20 seconds\&. With this
options another frequency in seconds can be specified\&.
.RE
.PP
\fB\-no\-dbus\fR
.RS 4
-Disables DBUS support if compiled in\.
+Disables DBUS support if compiled in\&.
.RE
.PP
\fB\-\-version\fR
@@ -189,21 +349,21 @@
.RE
.SH "FILES"
.PP
-\fI/etc/yp\.conf\fR
+\FC/etc/yp\&.conf\F[]
.RS 4
-configuration file\.
+configuration file\&.
.RE
.PP
-\fI/var/yp/binding/[domainname]\.[version]\fR
+\FC/var/yp/binding/[domainname]\&.[version]\F[]
.RS 4
-binding file containing information about each NIS domain\.
+binding file containing information about each NIS domain\&.
.RE
.PP
-\fI/var/run/ypbind\.pid\fR
+\FC/var/run/ypbind\&.pid\F[]
.RS 4
contains the process id of the currently running
\fBypbind\fR
-master process\.
+master process\&.
.RE
.SH "SEE ALSO"
.PP
@@ -219,4 +379,4 @@
.PP
\fBypbind\-mt\fR
-was written by Thorsten Kukuk <kukuk@thkukuk\.de>\.
+was written by Thorsten Kukuk <kukuk@thkukuk\&.de>\&.
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.22/man/yp.conf.5 new/ypbind-mt-1.23/man/yp.conf.5
--- old/ypbind-mt-1.22/man/yp.conf.5 2008-08-28 14:40:16.000000000 +0200
+++ new/ypbind-mt-1.23/man/yp.conf.5 2009-03-30 13:42:14.000000000 +0200
@@ -1,62 +1,218 @@
.\" Title: yp.conf
-.\" Author:
-.\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/>
-.\" Date: 08/28/2008
+.\" Author: [see the "AUTHOR" section]
+.\" Generator: DocBook XSL Stylesheets v1.74.0 <http://docbook.sf.net/>
+.\" Date: 03/30/2009
.\" Manual: ypbind-mt
.\" Source: ypbind-mt
+.\" Language: English
.\"
-.TH "YP\.CONF" "5" "08/28/2008" "ypbind-mt" "ypbind\-mt"
+.TH "YP\&.CONF" "5" "03/30/2009" "ypbind-mt" "ypbind\-mt"
+.\" -----------------------------------------------------------------
+.\" * (re)Define some macros
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" toupper - uppercase a string (locale-aware)
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de toupper
+.tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
+\\$*
+.tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SH-xref - format a cross-reference to an SH section
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de SH-xref
+.ie n \{\
+.\}
+.toupper \\$*
+.el \{\
+\\$*
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SH - level-one heading that works better for non-TTY output
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de1 SH
+.\" put an extra blank line of space above the head in non-TTY output
+.if t \{\
+.sp 1
+.\}
+.sp \\n[PD]u
+.nr an-level 1
+.set-an-margin
+.nr an-prevailing-indent \\n[IN]
+.fi
+.in \\n[an-margin]u
+.ti 0
+.HTML-TAG ".NH \\n[an-level]"
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+\." make the size of the head bigger
+.ps +3
+.ft B
+.ne (2v + 1u)
+.ie n \{\
+.\" if n (TTY output), use uppercase
+.toupper \\$*
+.\}
+.el \{\
+.nr an-break-flag 0
+.\" if not n (not TTY), use normal case (not uppercase)
+\\$1
+.in \\n[an-margin]u
+.ti 0
+.\" if not n (not TTY), put a border/line under subheading
+.sp -.6
+\l'\n(.lu'
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" SS - level-two heading that works better for non-TTY output
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de1 SS
+.sp \\n[PD]u
+.nr an-level 1
+.set-an-margin
+.nr an-prevailing-indent \\n[IN]
+.fi
+.in \\n[IN]u
+.ti \\n[SN]u
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.ps \\n[PS-SS]u
+\." make the size of the head bigger
+.ps +2
+.ft B
+.ne (2v + 1u)
+.if \\n[.$] \&\\$*
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BB/BE - put background/screen (filled box) around block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BB
+.if t \{\
+.sp -.5
+.br
+.in +2n
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EB
+.if t \{\
+.if "\\$2"adjust-for-leading-newline" \{\
+.sp -1
+.\}
+.br
+.di
+.in
+.ll
+.gcolor
+.nr BW \\n(.lu-\\n(.i
+.nr BH \\n(dn+.5v
+.ne \\n(BHu+.5v
+.ie "\\$2"adjust-for-leading-newline" \{\
+\M[\\$1]\h'1n'\v'+.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.el \{\
+\M[\\$1]\h'1n'\v'-.5v'\D'P \\n(BWu 0 0 \\n(BHu -\\n(BWu 0 0 -\\n(BHu'\M[]
+.\}
+.in 0
+.sp -.5v
+.nf
+.BX
+.in
+.sp .5v
+.fi
+.\}
+..
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" BM/EM - put colored marker in margin next to block of text
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.de BM
+.if t \{\
+.br
+.ll -2n
+.gcolor red
+.di BX
+.\}
+..
+.de EM
+.if t \{\
+.br
+.di
+.ll
+.gcolor
+.nr BH \\n(dn
+.ne \\n(BHu
+\M[\\$1]\D'P -.75n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .75n) 0 0 -\\n(BHu'\M[]
+.in 0
+.nf
+.BX
+.in
+.fi
+.\}
+..
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
-.SH "NAME"
-yp.conf - NIS binding configuration file
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.SH "Name"
+yp.conf \- NIS binding configuration file
.SH "DESCRIPTION"
.PP
The file
-\fI/etc/yp\.conf\fR
+\FC/etc/yp\&.conf\F[]
is read from
\fBypbind\fR(8)
-at startup or when receiving signal SIGHUP\. The entries are used for the
initial binding\. Valid entries are
+at startup or when receiving signal SIGHUP\&. The entries are used for the
initial binding\&. Valid entries are
.PP
\fBdomain\fR \fInisdomain\fR \fBserver\fR \fIhostname\fR
.RS 4
Use server
\fIhostname\fR
for the domain
-\fInisdomain\fR\. You could have more then one entry of this type for a single
domain\.
+\fInisdomain\fR\&. You could have more then one entry of this type for a
single domain\&.
.RE
.PP
\fBdomain\fR \fInisdomain\fR \fBbroadcast\fR
.RS 4
Use broadcast on the local net for domain
-\fInisdomain\fR\.
+\fInisdomain\fR\&.
.RE
.PP
\fBdomain\fR \fInisdomain\fR \fBslp\fR
.RS 4
Query the local running SLP server for hosts running ypserv and distributing
-\fInisdomain\fR\. This option is only available, if
+\fInisdomain\fR\&. This option is only available, if
\fBypbind\fR
-was compiled with SLP support\.
+was compiled with SLP support\&.
.RE
.PP
\fBypserver\fR \fIhostname\fR
.RS 4
Use server
\fIhostname\fR
-for the local domain\.
+for the local domain\&.
.RE
.PP
\fBbroadcast\fR
.RS 4
-If no other server is given or all of them are not reachable, try a broadcast
call for the default domain to find a server\.
+If no other server is given or all of them are not reachable, try a broadcast
call for the default domain to find a server\&.
.RE
.PP
If for a specific domain the broadcast option and fixed server are given,
\fBypbind\-mt\fR
-tries at first the given servers before falling back to broadcasting for a
running server\.
+tries at first the given servers before falling back to broadcasting for a
running server\&.
.SH "SEE ALSO"
.PP
@@ -65,4 +221,4 @@
.PP
\fBypbind\-mt\fR
-was written by Thorsten Kukuk <kukuk@thkukuk\.de>\.
+was written by Thorsten Kukuk <kukuk@thkukuk\&.de>\&.
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.22/NEWS new/ypbind-mt-1.23/NEWS
--- old/ypbind-mt-1.22/NEWS 2008-08-28 14:40:01.000000000 +0200
+++ new/ypbind-mt-1.23/NEWS 2009-03-30 13:45:56.000000000 +0200
@@ -4,6 +4,9 @@
Please send bug reports, questions and suggestions to <kukuk@xxxxxxxxxx>.
+Version 1.23
+* Improvements for NetworkManager support
+
Version 1.22
* Only write binding files if they really changed
Files old/ypbind-mt-1.22/po/de.gmo and new/ypbind-mt-1.23/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.22/po/de.po new/ypbind-mt-1.23/po/de.po
--- old/ypbind-mt-1.22/po/de.po 2008-08-28 14:40:05.000000000 +0200
+++ new/ypbind-mt-1.23/po/de.po 2009-03-30 13:00:21.000000000 +0200
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt\n"
"Report-Msgid-Bugs-To: kukuk@xxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-08-28 14:40+0200\n"
+"POT-Creation-Date: 2009-03-30 13:00+0200\n"
"PO-Revision-Date: 2004-02-13 16:22+01:00\n"
"Last-Translator: Thorsten Kukuk <kukuk@xxxxxxx>\n"
"Language-Team: No Language-Team\n"
@@ -185,61 +185,74 @@
msgid "No entry found."
msgstr "Keinen Eintrag gefunden."
-#: src/ypbind-mt.c:313
+#: src/ypbind-mt.c:307
+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:310
+#, 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:312
+msgid "or start ypbind with the -broadcast option.\n"
+msgstr "oder starte ypbind mit der -broadcast Option.\n"
+
+#: src/ypbind-mt.c:332
#, c-format
msgid "cannot create pidfile %s"
msgstr "Kann Pidfile %s nicht erzeugen."
-#: src/ypbind-mt.c:341
+#: src/ypbind-mt.c:360
#, c-format
msgid "fcntl error: %s"
msgstr "fcntl Fehler: %s"
-#: src/ypbind-mt.c:353
+#: src/ypbind-mt.c:372
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr "ypbind-mt l�uft bereits (pid %d) - beende mich"
-#: src/ypbind-mt.c:364
+#: src/ypbind-mt.c:383
msgid "cannot lock pidfile"
msgstr "Kann Pidfile nicht locken"
-#: src/ypbind-mt.c:416
+#: src/ypbind-mt.c:435
#, c-format
msgid "sigwait failed: ret=%d."
msgstr ""
-#: src/ypbind-mt.c:422
+#: src/ypbind-mt.c:441
msgid "SIGCHLD arrived, what should I do ?"
msgstr "SIGCHLD abgefangen, was soll ich machen ?"
-#: src/ypbind-mt.c:430
+#: src/ypbind-mt.c:449
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr "Signal (%d) zum beenden des Programms bekommen."
-#: src/ypbind-mt.c:439
+#: src/ypbind-mt.c:458
msgid "cannot unlock pidfile"
msgstr "Kann Pidfile nicht unlocken."
-#: src/ypbind-mt.c:448
+#: src/ypbind-mt.c:467
msgid "SIGHUP arrived, reloading config file."
msgstr "SIGHUP abgefangen, Config Datei wird neu geladen."
-#: src/ypbind-mt.c:461
+#: src/ypbind-mt.c:480
msgid "Ignoring SIGPIPE."
msgstr ""
-#: src/ypbind-mt.c:464
+#: src/ypbind-mt.c:483
#, c-format
msgid "Unknown signal: %d"
msgstr "Unbekanntes Signal: %d"
-#: src/ypbind-mt.c:481
+#: src/ypbind-mt.c:500
msgid "Usage:\n"
msgstr "Aufruf:\n"
-#: src/ypbind-mt.c:482
+#: src/ypbind-mt.c:501
#, fuzzy
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n"
@@ -249,114 +262,101 @@
" ypbind [-broadcast | -ypset | -ypsetme] [-p Port] [-f "
"configfile] [-no-ping] [-broken-server] [-local-only] [-debug]\n"
-#: src/ypbind-mt.c:484
+#: src/ypbind-mt.c:503
msgid "\t [-no-dbus]\n"
msgstr ""
-#: src/ypbind-mt.c:486
+#: src/ypbind-mt.c:505
msgid "\typbind -c [-f configfile]\n"
msgstr ""
-#: src/ypbind-mt.c:487
+#: src/ypbind-mt.c:506
msgid "\typbind --version\n"
msgstr ""
-#: src/ypbind-mt.c:523
+#: src/ypbind-mt.c:542
#, c-format
msgid "Cannot create UDP: %s"
msgstr "Kann UDP Socket nicht erzeugen: %s"
-#: src/ypbind-mt.c:541
+#: src/ypbind-mt.c:560
#, c-format
msgid "Cannot bind UDP: %s"
msgstr ""
-#: src/ypbind-mt.c:551
+#: src/ypbind-mt.c:570
msgid "Cannot create udp service."
msgstr "Kann UDP Servie nicht erzeugen."
-#: src/ypbind-mt.c:560
+#: src/ypbind-mt.c:579
msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)."
msgstr "Kann (YPBINDPROG, YPBINDVERS, upd) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:568
+#: src/ypbind-mt.c:587
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)."
msgstr ""
"Kann (YPBINDPROG, YPBINDOLDVERS, udp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:577
+#: src/ypbind-mt.c:596
#, c-format
msgid "Cannot create TCP: %s"
msgstr "Kann TCP Socket nicht erzeugen: %s"
-#: src/ypbind-mt.c:595
+#: src/ypbind-mt.c:614
#, c-format
msgid "Cannot bind TCP: %s"
msgstr ""
-#: src/ypbind-mt.c:605
+#: src/ypbind-mt.c:624
msgid "Cannot create tcp service.\n"
msgstr "Kann TCP Service nicht erzeugen.\n"
-#: src/ypbind-mt.c:613
+#: src/ypbind-mt.c:632
msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)."
msgstr "Kann (YPBINDPROG, YPBINDVERS, tcp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:621
+#: src/ypbind-mt.c:640
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)."
msgstr ""
"Kann (YPBINDPROG, YPBINDOLDVERS, tcp) nicht beim portmapper registrieren."
-#: src/ypbind-mt.c:714
+#: src/ypbind-mt.c:733
msgid "ERROR: domainname not set.\n"
msgstr "Fehler: Domainname wurde nicht gesetzt.\n"
-#: src/ypbind-mt.c:719
+#: src/ypbind-mt.c:738
msgid "domainname not set - aborting.\n"
msgstr "Domainname wurde nicht gesetzt - Abbruch.\n"
-#: src/ypbind-mt.c:728
+#: src/ypbind-mt.c:747
#, c-format
msgid "Config file %s is not ok.\n"
msgstr "Konfigurationsdatei %s ist nicht in Ordnung.\n"
-#: src/ypbind-mt.c:733
+#: src/ypbind-mt.c:752
#, c-format
msgid "Config file %s is ok.\n"
msgstr "Konfigurationsdatei %s ist in Ordnung.\n"
-#: src/ypbind-mt.c:740
+#: src/ypbind-mt.c:759
msgid "ypbind must be run as root\n"
msgstr "ypbind mu� als root gestartet werden.\n"
-#: src/ypbind-mt.c:748 src/ypbind-mt.c:757
+#: src/ypbind-mt.c:767 src/ypbind-mt.c:776
#, c-format
msgid "Could not create %s: %s\n"
msgstr "Kann %s nicht erzeugen: %s\n"
-#: src/ypbind-mt.c:764
+#: src/ypbind-mt.c:783
#, 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:773
-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:775
-#, 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:777
-msgid "or start ypbind with the -broadcast option.\n"
-msgstr "oder starte ypbind mit der -broadcast Option.\n"
-
-#: src/ypbind-mt.c:854
+#: src/ypbind-mt.c:871
msgid "Could not block signals."
msgstr "Kann die Signale nicht blocken."
-#: src/ypbind-mt.c:899
+#: src/ypbind-mt.c:916
msgid "svc_run returned."
msgstr "svc_run hat sich beendet."
Files old/ypbind-mt-1.22/po/sv.gmo and new/ypbind-mt-1.23/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.22/po/sv.po new/ypbind-mt-1.23/po/sv.po
--- old/ypbind-mt-1.22/po/sv.po 2008-08-28 14:40:05.000000000 +0200
+++ new/ypbind-mt-1.23/po/sv.po 2009-03-30 13:00:21.000000000 +0200
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: ypbind-mt 1.20-2\n"
"Report-Msgid-Bugs-To: kukuk@xxxxxxxxxxxxx\n"
-"POT-Creation-Date: 2008-08-28 14:40+0200\n"
+"POT-Creation-Date: 2009-03-30 13:00+0200\n"
"PO-Revision-Date: 2006-11-12 16:48+0100\n"
"Last-Translator: Daniel Nylander <po@xxxxxxxxxxxxxxxxx>\n"
"Language-Team: Swedish <tp-sv@xxxxxxxxxxxxxxx>\n"
@@ -184,61 +184,74 @@
msgid "No entry found."
msgstr "Ingen post hittades."
-#: src/ypbind-mt.c:313
+#: src/ypbind-mt.c:307
+msgid "No NIS server and no -broadcast option specified.\n"
+msgstr "Ingen NIS-server och flaggan -broadcast angavs inte.\n"
+
+#: src/ypbind-mt.c:310
+#, 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:312
+msgid "or start ypbind with the -broadcast option.\n"
+msgstr "eller starta ypbind med flaggan -broadcast.\n"
+
+#: src/ypbind-mt.c:332
#, c-format
msgid "cannot create pidfile %s"
msgstr "kan inte skapa pid-filen %s"
-#: src/ypbind-mt.c:341
+#: src/ypbind-mt.c:360
#, c-format
msgid "fcntl error: %s"
msgstr "fcntl-fel: %s"
-#: src/ypbind-mt.c:353
+#: src/ypbind-mt.c:372
#, c-format
msgid "ypbind-mt already running (pid %d) - exiting"
msgstr "ypbind-mt k�r redan (pid %d) - avslutar"
-#: src/ypbind-mt.c:364
+#: src/ypbind-mt.c:383
msgid "cannot lock pidfile"
msgstr "kan inte l�sa pid-fil"
-#: src/ypbind-mt.c:416
+#: src/ypbind-mt.c:435
#, c-format
msgid "sigwait failed: ret=%d."
msgstr "sigwait misslyckades: ret=%d."
-#: src/ypbind-mt.c:422
+#: src/ypbind-mt.c:441
msgid "SIGCHLD arrived, what should I do ?"
msgstr "SIGCHLD togs emot, vad ska jag g�ra?"
-#: src/ypbind-mt.c:430
+#: src/ypbind-mt.c:449
#, c-format
msgid "Signal (%d) for quitting program arrived."
msgstr "Signalen (%d) f�r programavslut togs emot."
-#: src/ypbind-mt.c:439
+#: src/ypbind-mt.c:458
msgid "cannot unlock pidfile"
msgstr "kan inte l�sa upp pid-fil"
-#: src/ypbind-mt.c:448
+#: src/ypbind-mt.c:467
msgid "SIGHUP arrived, reloading config file."
msgstr "SIGHUP togs emot, l�ser om konfigurationsfilen."
-#: src/ypbind-mt.c:461
+#: src/ypbind-mt.c:480
msgid "Ignoring SIGPIPE."
msgstr "Ignorerar SIGPIPE."
-#: src/ypbind-mt.c:464
+#: src/ypbind-mt.c:483
#, c-format
msgid "Unknown signal: %d"
msgstr "Ok�nd signal: %d"
-#: src/ypbind-mt.c:481
+#: src/ypbind-mt.c:500
msgid "Usage:\n"
msgstr "Anv�ndning:\n"
-#: src/ypbind-mt.c:482
+#: src/ypbind-mt.c:501
#, fuzzy
msgid ""
"\typbind [-broadcast | -ypset | -ypsetme] [-p port] [-f configfile]\n"
@@ -248,112 +261,99 @@
"\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:484
+#: src/ypbind-mt.c:503
msgid "\t [-no-dbus]\n"
msgstr "\t [-no-dbus]\n"
-#: src/ypbind-mt.c:486
+#: src/ypbind-mt.c:505
msgid "\typbind -c [-f configfile]\n"
msgstr "\typbind -c [-f konfigurationsfil]\n"
-#: src/ypbind-mt.c:487
+#: src/ypbind-mt.c:506
msgid "\typbind --version\n"
msgstr "\typbind --version\n"
-#: src/ypbind-mt.c:523
+#: src/ypbind-mt.c:542
#, c-format
msgid "Cannot create UDP: %s"
msgstr "Kan inte skapa UDP: %s"
-#: src/ypbind-mt.c:541
+#: src/ypbind-mt.c:560
#, c-format
msgid "Cannot bind UDP: %s"
msgstr "Kan inte binda UDP: %s"
-#: src/ypbind-mt.c:551
+#: src/ypbind-mt.c:570
msgid "Cannot create udp service."
msgstr "Kan inte skapa udp-tj�nst."
-#: src/ypbind-mt.c:560
+#: src/ypbind-mt.c:579
msgid "Unable to register (YPBINDPROG, YPBINDVERS, udp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, udp)."
-#: src/ypbind-mt.c:568
+#: src/ypbind-mt.c:587
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, udp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDOLDVERS, udp)."
-#: src/ypbind-mt.c:577
+#: src/ypbind-mt.c:596
#, c-format
msgid "Cannot create TCP: %s"
msgstr "Kan inte skapa TCP: %s"
-#: src/ypbind-mt.c:595
+#: src/ypbind-mt.c:614
#, c-format
msgid "Cannot bind TCP: %s"
msgstr "Kan inte binda TCP: %s"
-#: src/ypbind-mt.c:605
+#: src/ypbind-mt.c:624
msgid "Cannot create tcp service.\n"
msgstr "Kan inte skapa tcp-tj�nst.\n"
-#: src/ypbind-mt.c:613
+#: src/ypbind-mt.c:632
msgid "Unable to register (YPBINDPROG, YPBINDVERS, tcp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDVERS, tcp)."
-#: src/ypbind-mt.c:621
+#: src/ypbind-mt.c:640
msgid "Unable to register (YPBINDPROG, YPBINDOLDVERS, tcp)."
msgstr "Kan inte registrera (YPBINDPROG, YPBINDOLDVERS, tcp)."
-#: src/ypbind-mt.c:714
+#: src/ypbind-mt.c:733
msgid "ERROR: domainname not set.\n"
msgstr "FEL: domainname inte inst�llt.\n"
-#: src/ypbind-mt.c:719
+#: src/ypbind-mt.c:738
msgid "domainname not set - aborting.\n"
msgstr "domainname inte inst�llt - avbryter.\n"
-#: src/ypbind-mt.c:728
+#: src/ypbind-mt.c:747
#, c-format
msgid "Config file %s is not ok.\n"
msgstr "Konfigurationsfilen %s �r inte ok.\n"
-#: src/ypbind-mt.c:733
+#: src/ypbind-mt.c:752
#, c-format
msgid "Config file %s is ok.\n"
msgstr "Konfigurationsfilen %s �r ok.\n"
-#: src/ypbind-mt.c:740
+#: src/ypbind-mt.c:759
msgid "ypbind must be run as root\n"
msgstr "ypbind m�ste k�ras som root\n"
-#: src/ypbind-mt.c:748 src/ypbind-mt.c:757
+#: src/ypbind-mt.c:767 src/ypbind-mt.c:776
#, c-format
msgid "Could not create %s: %s\n"
msgstr "Kunde inte skapa %s: %s\n"
-#: src/ypbind-mt.c:764
+#: src/ypbind-mt.c:783
#, c-format
msgid "Could not change to directory %s: %s\n"
msgstr "Kunde inte �ndra till katalogen %s: %s\n"
-#: src/ypbind-mt.c:773
-msgid "No NIS server and no -broadcast option specified.\n"
-msgstr "Ingen NIS-server och flaggan -broadcast angavs inte.\n"
-
-#: src/ypbind-mt.c:775
-#, 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:777
-msgid "or start ypbind with the -broadcast option.\n"
-msgstr "eller starta ypbind med flaggan -broadcast.\n"
-
-#: src/ypbind-mt.c:854
+#: src/ypbind-mt.c:871
msgid "Could not block signals."
msgstr "Kunde inte blockera signaler."
-#: src/ypbind-mt.c:899
+#: src/ypbind-mt.c:916
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.22/src/ypbind_dbus_nm.c new/ypbind-mt-1.23/src/ypbind_dbus_nm.c
--- old/ypbind-mt-1.22/src/ypbind_dbus_nm.c 2007-02-14 14:01:57.000000000
+0100
+++ new/ypbind-mt-1.23/src/ypbind_dbus_nm.c 2009-03-30 14:24:03.000000000
+0200
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006 Thorsten Kukuk
+/* Copyright (c) 2006, 2009 Thorsten Kukuk
This file is part of ypbind-mt.
Author: Thorsten Kukuk <kukuk@xxxxxxx>
@@ -320,13 +320,13 @@
if (check_online (connection) == 1)
{
if (debug_flag)
- log_msg (LOG_DEBUG, "Are already online");
- is_online = 1;
+ log_msg (LOG_DEBUG, "Network is available.");
+ go_online ();
}
else
{
if (debug_flag)
- log_msg (LOG_DEBUG, "Are offline");
+ log_msg (LOG_DEBUG, "No network is available. Waiting...");
is_online = 0;
}
return 1;
@@ -335,7 +335,7 @@
{
if (debug_flag)
log_msg (LOG_DEBUG, "No connection possible, assume online mode");
- is_online = 1;
+ go_online ();
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.22/src/ypbind-mt.c new/ypbind-mt-1.23/src/ypbind-mt.c
--- old/ypbind-mt-1.22/src/ypbind-mt.c 2008-04-15 13:22:13.000000000 +0200
+++ new/ypbind-mt-1.23/src/ypbind-mt.c 2009-03-30 14:24:24.000000000 +0200
@@ -1,4 +1,4 @@
-/* Copyright (c) 1998, 1999, 2001, 2002, 2004, 2005, 2006, 2008 Thorsten Kukuk
+/* Copyright (c) 1998 - 2009 Thorsten Kukuk
This file is part of ypbind-mt.
Author: Thorsten Kukuk <kukuk@xxxxxxx>
@@ -100,7 +100,7 @@
}
}
-/* Load the config file (/etc/yp.conf) */
+/* Load or check syntax of the config file (/etc/yp.conf) */
int
load_config (int check_syntax)
{
@@ -297,6 +297,25 @@
return 0;
}
+
+/* Load the configuration, exiting if there's an error */
+static void
+load_config_or_exit(void)
+{
+ if (load_config (0) != 0)
+ {
+ fputs (_("No NIS server and no -broadcast option specified.\n"),
+ stderr);
+ fprintf (stderr,
+ _("Add a NIS server to the %s configuration file,\n"),
+ configfile);
+ fputs (_("or start ypbind with the -broadcast option.\n"),
+ stderr);
+ exit (1);
+ }
+}
+
+
/* Create a pidfile on startup */
static void
create_pidfile (void)
@@ -768,15 +787,13 @@
if (!use_broadcast)
{
- if (load_config (0) != 0)
- {
- fputs (_("No NIS server and no -broadcast option specified.\n"),
stderr);
- fprintf (stderr,
- _("Add a NIS server to the %s configuration file,\n"),
- configfile);
- fputs (_("or start ypbind with the -broadcast option.\n"), stderr);
- exit (1);
- }
+ /* If we don't use DBUS, exit with an error if we cannot load the
+ config. Else load the config, maybe there is a network already
+ running. */
+ if (disable_dbus)
+ load_config_or_exit();
+ else
+ load_config (0);
}
else
add_server (domain, NULL, 0);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |