I'm sending two patches cleaning up some parts of code which seem to be
redundant.
--
Thank you
Jan Zeleny
Red Hat Software Engineer
Brno, Czech Republic
From e112fc811e72658b2f211d1bdc9ba76851029d11 Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzel...@redhat.com>
Date: Wed, 2 Mar 2011 14:04:50 +0100
Subject: [PATCH] Code cleanup
Deleted some unused code.
---
src/providers/data_provider.h | 1 -
src/providers/data_provider_be.c | 49 --------------------------------------
2 files changed, 0 insertions(+), 50 deletions(-)
diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h
index e55b4ab7b41333059cbb51cb6760bdf5d8513f8e..38397126e50edee928f6080289a3c082f5338d66 100644
--- a/src/providers/data_provider.h
+++ b/src/providers/data_provider.h
@@ -60,7 +60,6 @@
#define BE_PROVIDE_POLICY (1<<10)
#define DP_METHOD_REGISTER "RegisterService"
-#define DP_METHOD_ONLINE "getOnline"
#define DP_METHOD_GETACCTINFO "getAccountInfo"
/**
* @defgroup pamHandler PAM DBUS request
diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c
index b4f3660e1fd7878e53a2b07d61f189c4afb05309..01d28558035f6c936dd541f8df34034e6710809f 100644
--- a/src/providers/data_provider_be.c
+++ b/src/providers/data_provider_be.c
@@ -76,13 +76,11 @@ struct sbus_interface monitor_be_interface = {
};
static int client_registration(DBusMessage *message, struct sbus_connection *conn);
-static int be_check_online(DBusMessage *message, struct sbus_connection *conn);
static int be_get_account_info(DBusMessage *message, struct sbus_connection *conn);
static int be_pam_handler(DBusMessage *message, struct sbus_connection *conn);
struct sbus_method be_methods[] = {
{ DP_METHOD_REGISTER, client_registration },
- { DP_METHOD_ONLINE, be_check_online },
{ DP_METHOD_GETACCTINFO, be_get_account_info },
{ DP_METHOD_PAMHANDLER, be_pam_handler },
{ NULL, NULL }
@@ -180,53 +178,6 @@ static void be_reset_offline(struct be_ctx *ctx)
be_run_online_cb(ctx);
}
-static int be_check_online(DBusMessage *message, struct sbus_connection *conn)
-{
- struct be_client *becli;
- DBusMessage *reply;
- DBusConnection *dbus_conn;
- dbus_bool_t dbret;
- void *user_data;
- dbus_uint16_t online;
- dbus_uint16_t err_maj = 0;
- dbus_uint32_t err_min = 0;
- static const char *err_msg = "Success";
-
- user_data = sbus_conn_get_private_data(conn);
- if (!user_data) return EINVAL;
- becli = talloc_get_type(user_data, struct be_client);
- if (!becli) return EINVAL;
-
- reply = dbus_message_new_method_return(message);
- if (!reply) return ENOMEM;
-
- if (be_is_offline(becli->bectx)) {
- online = MOD_OFFLINE;
- } else {
- online = MOD_ONLINE;
- }
-
- dbret = dbus_message_append_args(reply,
- DBUS_TYPE_UINT16, &online,
- DBUS_TYPE_UINT16, &err_maj,
- DBUS_TYPE_UINT32, &err_min,
- DBUS_TYPE_STRING, &err_msg,
- DBUS_TYPE_INVALID);
- if (!dbret) {
- DEBUG(1, ("Failed to generate dbus reply\n"));
- return EIO;
- }
-
- dbus_conn = sbus_get_connection(becli->conn);
- dbus_connection_send(dbus_conn, reply, NULL);
- dbus_message_unref(reply);
-
- DEBUG(4, ("Request processed. Returned %d,%d,%s\n",
- err_maj, err_min, err_msg));
-
- return EOK;
-}
-
static char *dp_pam_err_to_string(TALLOC_CTX *memctx, int dp_err_type, int errnum)
{
switch (dp_err_type) {
--
1.7.1
From c29bd2f5a42ff16194387937484b27340004f81f Mon Sep 17 00:00:00 2001
From: Jan Zeleny <jzel...@redhat.com>
Date: Wed, 2 Mar 2011 14:09:16 +0100
Subject: [PATCH] Code cleanup
deleted some unused code
---
src/providers/krb5/krb5_auth.c | 8 --------
1 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c
index 49dc6d2e48238984e2dcaa8eab439b836c056aa4..379a97be6446bdf0fc5c9bc120c561a532d454cf 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -867,14 +867,6 @@ static void krb5_child_done(struct tevent_req *subreq)
}
}
- struct sysdb_attrs *attrs;
- attrs = sysdb_new_attrs(state);
- ret = sysdb_attrs_add_string(attrs, SYSDB_CCACHE_FILE, kr->ccname);
- if (ret != EOK) {
- DEBUG(1, ("sysdb_attrs_add_string failed.\n"));
- goto done;
- }
-
ret = krb5_save_ccname(state, state->be_ctx->sysdb,
state->be_ctx->domain,
pd->user, kr->ccname);
--
1.7.1
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://fedorahosted.org/mailman/listinfo/sssd-devel
