From 2de7dab64517fcaee5198342e9b7890cdf1c7776 Mon Sep 17 00:00:00 2001
From: Simo Sorce <ssorce@redhat.com>
Date: Tue, 11 Aug 2009 12:03:01 -0400
Subject: Change the why DP clients identify

Mirrors what we have done with the monitor.
---
 server/responder/nss/nsssrv.c    | 18 +++++++--
 server/responder/nss/nsssrv.h    |  2 -
 server/responder/nss/nsssrv_dp.c | 80 ----------------------------------------
 3 files changed, 15 insertions(+), 85 deletions(-)
 delete mode 100644 server/responder/nss/nsssrv_dp.c

(limited to 'server/responder/nss')

diff --git a/server/responder/nss/nsssrv.c b/server/responder/nss/nsssrv.c
index e4b121bf2..456c62929 100644
--- a/server/responder/nss/nsssrv.c
+++ b/server/responder/nss/nsssrv.c
@@ -203,12 +203,22 @@ static void nss_dp_reconnect_init(struct sbus_connection *conn, int status, void
     nss_shutdown(rctx);
 }
 
+static struct sbus_method nss_dp_methods[] = {
+    { NULL, NULL }
+};
+
+struct sbus_interface nss_dp_interface = {
+    DP_CLI_INTERFACE,
+    DP_CLI_PATH,
+    SBUS_DEFAULT_VTABLE,
+    nss_dp_methods,
+    NULL
+};
 
 int nss_process_init(TALLOC_CTX *mem_ctx,
                      struct tevent_context *ev,
                      struct confdb_ctx *cdb)
 {
-    struct sbus_interface *nss_dp_interface;
     struct sss_cmd_table *nss_cmds;
     struct nss_ctx *nctx;
     int ret, max_retries;
@@ -225,7 +235,6 @@ int nss_process_init(TALLOC_CTX *mem_ctx,
         return ret;
     }
 
-    nss_dp_interface = get_nss_dp_interface();
     nss_cmds = get_nss_cmds();
 
     ret = sss_process_init(nctx, ev, cdb,
@@ -234,8 +243,11 @@ int nss_process_init(TALLOC_CTX *mem_ctx,
                            NSS_SRV_CONFIG,
                            NSS_SBUS_SERVICE_NAME,
                            NSS_SBUS_SERVICE_VERSION,
-                           nss_dp_interface,
                            &monitor_nss_interface,
+                           DP_CLI_FRONTEND,
+                           DATA_PROVIDER_VERSION,
+                           "NSS", "",
+                           &nss_dp_interface,
                            &nctx->rctx);
     if (ret != EOK) {
         return ret;
diff --git a/server/responder/nss/nsssrv.h b/server/responder/nss/nsssrv.h
index f34456f4f..0d3124c72 100644
--- a/server/responder/nss/nsssrv.h
+++ b/server/responder/nss/nsssrv.h
@@ -66,8 +66,6 @@ struct nss_packet;
 
 int nss_cmd_execute(struct cli_ctx *cctx);
 
-/* from nsssrv_dp.c */
-struct sbus_interface *get_nss_dp_interface(void);
 struct sss_cmd_table *get_nss_cmds(void);
 
 #endif /* __NSSSRV_H__ */
diff --git a/server/responder/nss/nsssrv_dp.c b/server/responder/nss/nsssrv_dp.c
deleted file mode 100644
index 92a2d4415..000000000
--- a/server/responder/nss/nsssrv_dp.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-   SSSD
-
-   NSS Responder - Data Provider Interfaces
-
-   Copyright (C) Simo Sorce <ssorce@redhat.com>	2008
-
-   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/>.
-*/
-
-#include <sys/time.h>
-#include <time.h>
-#include "util/util.h"
-#include "responder/common/responder_packet.h"
-#include "responder/nss/nsssrv.h"
-#include "providers/data_provider.h"
-#include "sbus/sbus_client.h"
-#include "providers/dp_sbus.h"
-
-static int nss_dp_identity(DBusMessage *message, struct sbus_connection *conn)
-{
-    dbus_uint16_t version = DATA_PROVIDER_VERSION;
-    dbus_uint16_t clitype = DP_CLI_FRONTEND;
-    const char *cliname = "NSS";
-    const char *nullname = "";
-    DBusMessage *reply;
-    dbus_bool_t ret;
-
-    DEBUG(4,("Sending ID reply: (%d,%d,%s)\n",
-             clitype, version, cliname));
-
-    reply = dbus_message_new_method_return(message);
-    if (!reply) return ENOMEM;
-
-    ret = dbus_message_append_args(reply,
-                                   DBUS_TYPE_UINT16, &clitype,
-                                   DBUS_TYPE_UINT16, &version,
-                                   DBUS_TYPE_STRING, &cliname,
-                                   DBUS_TYPE_STRING, &nullname,
-                                   DBUS_TYPE_INVALID);
-    if (!ret) {
-        dbus_message_unref(reply);
-        return EIO;
-    }
-
-    /* send reply back */
-    sbus_conn_send_reply(conn, reply);
-    dbus_message_unref(reply);
-
-    return EOK;
-}
-
-static struct sbus_method nss_dp_methods[] = {
-    { DP_CLI_METHOD_IDENTITY, nss_dp_identity },
-    { NULL, NULL }
-};
-
-struct sbus_interface nss_dp_interface = {
-    DATA_PROVIDER_INTERFACE,
-    DATA_PROVIDER_PATH,
-    SBUS_DEFAULT_VTABLE,
-    nss_dp_methods,
-    NULL
-};
-
-struct sbus_interface *get_nss_dp_interface(void)
-{
-    return &nss_dp_interface;
-}
-- 
cgit