Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ae8c1d043d | ||
|
5b79a6bc46 | ||
|
d9fd11fbb1 | ||
|
235e401634 |
@ -1,8 +1,21 @@
|
||||
diff -up ypbind-mt-1.32/src/ypbind_dbus_nm.c.dbus ypbind-mt-1.32/src/ypbind_dbus_nm.c
|
||||
--- ypbind-mt-1.32/src/ypbind_dbus_nm.c.dbus 2011-04-07 14:55:56.251110287 +0200
|
||||
+++ ypbind-mt-1.32/src/ypbind_dbus_nm.c 2011-04-07 16:47:17.747108590 +0200
|
||||
@@ -42,13 +42,19 @@
|
||||
#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
|
||||
--- ypbind-mt-1.32/src/ypbind_dbus_nm.c.dbus 2010-07-07 14:27:26.000000000 +0200
|
||||
+++ ypbind-mt-1.32/src/ypbind_dbus_nm.c 2011-04-29 14:38:23.565951109 +0200
|
||||
@@ -32,6 +32,9 @@
|
||||
#include <dbus/dbus-glib-lowlevel.h>
|
||||
#include <dbus/dbus-glib.h>
|
||||
|
||||
+/* We have our own constant, NM uses directly "StateChanged" string */
|
||||
+#define NM_DBUS_SIGNAL_STATE_CHANGED "StateChanged"
|
||||
+
|
||||
#ifdef HAVE_NETWORKMANAGER_NETWORKMANAGER_H
|
||||
#include <NetworkManager/NetworkManager.h>
|
||||
#include <NetworkManager/NetworkManagerVPN.h>
|
||||
@@ -39,16 +42,21 @@
|
||||
#define NM_DBUS_INTERFACE "org.freedesktop.NetworkManager"
|
||||
#define NM_DBUS_SERVICE "org.freedesktop.NetworkManager"
|
||||
#define NM_DBUS_PATH "/org/freedesktop/NetworkManager"
|
||||
-#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange"
|
||||
|
||||
typedef enum NMState {
|
||||
- NM_STATE_UNKNOWN = 0,
|
||||
@ -26,3 +39,12 @@ diff -up ypbind-mt-1.32/src/ypbind_dbus_nm.c.dbus ypbind-mt-1.32/src/ypbind_dbus
|
||||
#endif
|
||||
|
||||
#define DBUS_MESSAGE_MATCH \
|
||||
@@ -150,7 +158,7 @@ dbus_filter (DBusConnection *connection,
|
||||
handled = DBUS_HANDLER_RESULT_HANDLED;
|
||||
}
|
||||
else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE,
|
||||
- NM_DBUS_VPN_SIGNAL_STATE_CHANGE))
|
||||
+ NM_DBUS_SIGNAL_STATE_CHANGED))
|
||||
{
|
||||
NMState state = NM_STATE_UNKNOWN;
|
||||
|
||||
|
10
ypbind.init
10
ypbind.init
@ -103,17 +103,13 @@ start() {
|
||||
# the following fixes problems with the init scripts continuing
|
||||
# even when we are really not bound yet to a server, and then things
|
||||
# that need NIS fail.
|
||||
timeout=10
|
||||
timeout=$NISTIMEOUT
|
||||
firsttime=1
|
||||
SECONDS=0
|
||||
while [ $SECONDS -lt $timeout ]; do
|
||||
while [ $SECONDS -lt $timeout ] || [ $firsttime -eq 1 ] ; do
|
||||
firsttime=0
|
||||
if /usr/sbin/rpcinfo -p | LC_ALL=C fgrep -q ypbind
|
||||
then
|
||||
if [ $firsttime -eq 1 ]; then
|
||||
# reset timeout
|
||||
timeout=$NISTIMEOUT
|
||||
firsttime=0
|
||||
fi
|
||||
/usr/bin/ypwhich > /dev/null 2>&1
|
||||
retval=$?
|
||||
if [ $retval -eq 0 ]; then
|
||||
|
14
ypbind.spec
14
ypbind.spec
@ -1,7 +1,7 @@
|
||||
Summary: The NIS daemon which binds NIS clients to an NIS domain
|
||||
Name: ypbind
|
||||
Version: 1.32
|
||||
Release: 8%{?dist}
|
||||
Release: 8%{?dist}.3
|
||||
License: GPLv2
|
||||
Group: System Environment/Daemons
|
||||
Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
|
||||
@ -88,6 +88,18 @@ fi
|
||||
%doc README NEWS COPYING
|
||||
|
||||
%changelog
|
||||
* Mon Nov 21 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-8.fc15.3
|
||||
- fixed firsttime handling in ypbind.init wait cycle
|
||||
|
||||
* Tue Nov 15 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-8.fc15.2
|
||||
- Fixed init script to handle long rpcinfo requests
|
||||
(rhbz#624688)
|
||||
|
||||
* Fri Apr 29 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-8.fc15.1
|
||||
- Removed NM_DBUS_VPN_SIGNAL_STATE_CHANGE, use own constant
|
||||
NM_DBUS_SIGNAL_STATE_CHANGED.
|
||||
(rhbz#696629)
|
||||
|
||||
* Thu Apr 14 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-8
|
||||
- Added rpcbind to LSB header in SysV init file.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user