From c0f3393d4ab923e2eedab0fad88a864e2aae9fc9 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Mon, 17 Aug 2009 04:29:47 -0400 Subject: Fix reconnection code Remove redundant reconnection code that was interfeering with the sbus reconnection code. Consolidate include files for sbus relates operations. Make pamsrv code similar to nsssrv code. --- server/monitor/monitor_interfaces.h | 10 ++++++++++ server/monitor/monitor_sbus.c | 1 - server/monitor/monitor_sbus.h | 34 ---------------------------------- 3 files changed, 10 insertions(+), 35 deletions(-) delete mode 100644 server/monitor/monitor_sbus.h (limited to 'server/monitor') diff --git a/server/monitor/monitor_interfaces.h b/server/monitor/monitor_interfaces.h index 211c25dd..7d0390bf 100644 --- a/server/monitor/monitor_interfaces.h +++ b/server/monitor/monitor_interfaces.h @@ -43,3 +43,13 @@ #define MON_CLI_METHOD_RES_INIT "resInit" #define SSSD_SERVICE_PIPE "private/sbus-monitor" + +int monitor_get_sbus_address(TALLOC_CTX *mem_ctx, struct confdb_ctx *confdb, + char **address); +int monitor_common_send_id(struct sbus_connection *conn, + const char *name, uint16_t version); +int monitor_common_pong(DBusMessage *message, + struct sbus_connection *conn); +int monitor_common_res_init(DBusMessage *message, + struct sbus_connection *conn); + diff --git a/server/monitor/monitor_sbus.c b/server/monitor/monitor_sbus.c index 777a47fe..9995986b 100644 --- a/server/monitor/monitor_sbus.c +++ b/server/monitor/monitor_sbus.c @@ -27,7 +27,6 @@ #include "util/util.h" #include "confdb/confdb.h" #include "sbus/sssd_dbus.h" -#include "monitor/monitor_sbus.h" #include "monitor/monitor_interfaces.h" int monitor_get_sbus_address(TALLOC_CTX *mem_ctx, struct confdb_ctx *confdb, char **address) diff --git a/server/monitor/monitor_sbus.h b/server/monitor/monitor_sbus.h deleted file mode 100644 index d84954bd..00000000 --- a/server/monitor/monitor_sbus.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - SSSD - - Data Provider Helpers - - Copyright (C) Stephen Gallagher 2009 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef MONITOR_SBUS_H_ -#define MONITOR_SBUS_H_ - -int monitor_get_sbus_address(TALLOC_CTX *mem_ctx, struct confdb_ctx *confdb, - char **address); -int monitor_common_send_id(struct sbus_connection *conn, - const char *name, uint16_t version); -int monitor_common_pong(DBusMessage *message, - struct sbus_connection *conn); -int monitor_common_res_init(DBusMessage *message, - struct sbus_connection *conn); - -#endif /* MONITOR_SBUS_H_ */ -- cgit