diff options
| author | Simo Sorce <ssorce@redhat.com> | 2009-08-17 04:29:47 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2009-08-17 09:39:01 -0400 |
| commit | c0f3393d4ab923e2eedab0fad88a864e2aae9fc9 (patch) | |
| tree | 1a31b6e55879396897441545ac5d0278e7371c49 /server/monitor | |
| parent | 7385f34a3c8c68cf0f87d64e55e0ca44f46fdeaa (diff) | |
| download | sssd-c0f3393d4ab923e2eedab0fad88a864e2aae9fc9.tar.gz sssd-c0f3393d4ab923e2eedab0fad88a864e2aae9fc9.tar.xz sssd-c0f3393d4ab923e2eedab0fad88a864e2aae9fc9.zip | |
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.
Diffstat (limited to 'server/monitor')
| -rw-r--r-- | server/monitor/monitor_interfaces.h | 10 | ||||
| -rw-r--r-- | server/monitor/monitor_sbus.c | 1 | ||||
| -rw-r--r-- | server/monitor/monitor_sbus.h | 34 |
3 files changed, 10 insertions, 35 deletions
diff --git a/server/monitor/monitor_interfaces.h b/server/monitor/monitor_interfaces.h index 211c25dd2..7d0390bfd 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 777a47fed..9995986b8 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 d84954bd1..000000000 --- a/server/monitor/monitor_sbus.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - SSSD - - Data Provider Helpers - - Copyright (C) Stephen Gallagher <sgallagh@redhat.com> 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 <http://www.gnu.org/licenses/>. -*/ - -#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_ */ |