rpms/ypbind
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Removed NM_DBUS_VPN_SIGNAL_STATE_CHANGE, use own constant

Browse Source 
NM_DBUS_SIGNAL_STATE_CHANGED.
(rhbz#696629)
This commit is contained in:
Honza Horák 2011-04-29 15:32:52 +02:00
parent 451e8a7d42
commit ae695eaefd
2 changed files with 32 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ypbind-mt-1.32-dbus.patch
View File

@ -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 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.dbus 2010-07-07 14:27:26.000000000 +0200
+++ ypbind-mt-1.32/src/ypbind_dbus_nm.c 2011-04-07 16:47:17.747108590 +0200 +++ ypbind-mt-1.32/src/ypbind_dbus_nm.c 2011-04-29 14:38:23.565951109 +0200
@@ -42,13 +42,19 @@ @@ -32,6 +32,9 @@
#define NM_DBUS_VPN_SIGNAL_STATE_CHANGE "StateChange" #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 { typedef enum NMState {
- NM_STATE_UNKNOWN = 0, - 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 #endif
#define DBUS_MESSAGE_MATCH \ #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;

7
ypbind.spec
View File

@ -1,7 +1,7 @@
Summary: The NIS daemon which binds NIS clients to an NIS domain Summary: The NIS daemon which binds NIS clients to an NIS domain
Name: ypbind Name: ypbind
Version: 1.32 Version: 1.32
Release: 10%{?dist} Release: 11%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2 Source0: ftp://ftp.us.kernel.org/pub/linux/utils/net/NIS/ypbind-mt-%{version}.tar.bz2
@ -108,6 +108,11 @@ fi
%doc README NEWS COPYING %doc README NEWS COPYING
%changelog %changelog
* Fri Apr 29 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-11
- Removed NM_DBUS_VPN_SIGNAL_STATE_CHANGE, use own constant
NM_DBUS_SIGNAL_STATE_CHANGED.
(rhbz#696629)
* Wed Apr 28 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-10 * Wed Apr 28 2011 Honza Horak <hhorak@redhat.com> - 3:1.32-10
- Made EnvironmentFile in systemd definition optional - Made EnvironmentFile in systemd definition optional
(rhbz#632620) (rhbz#632620)