ehlo, There are some unused function parameters.
I split change to three patches for easier review, but I can squash them to only one patch. LS
>From d6a6f20445fc60abc25bae4e121e65a2d59038da Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Thu, 29 Aug 2013 13:37:32 +0200 Subject: [PATCH 1/3] KRB: Remove unused memory context mem_ctx was unused in function get_domain_or_subdomain --- src/providers/krb5/krb5_auth.c | 2 +- src/providers/krb5/krb5_utils.c | 2 +- src/providers/krb5/krb5_utils.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index db0aa936ff5577afedf72cb43f1c71485e16505c..03b54cbbf4f7ad3e5a0e408f95d2811407e06d6b 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -484,7 +484,7 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, state->pam_status = PAM_SYSTEM_ERR; state->dp_err = DP_ERR_FATAL; - ret = get_domain_or_subdomain(state, be_ctx, pd->domain, &state->domain); + ret = get_domain_or_subdomain(be_ctx, pd->domain, &state->domain); if (ret != EOK) { DEBUG(SSSDBG_OP_FAILURE, ("get_domain_or_subdomain failed.\n")); goto done; diff --git a/src/providers/krb5/krb5_utils.c b/src/providers/krb5/krb5_utils.c index 89c1eeb60b1027b03e07d5b22d2b6402942569be..7c6d90c8fbe4a910d54ac20c0451a7b762b86046 100644 --- a/src/providers/krb5/krb5_utils.c +++ b/src/providers/krb5/krb5_utils.c @@ -1428,7 +1428,7 @@ struct sss_krb5_cc_be keyring_cc = { #endif /* HAVE_KRB5_CC_COLLECTION */ -errno_t get_domain_or_subdomain(TALLOC_CTX *mem_ctx, struct be_ctx *be_ctx, +errno_t get_domain_or_subdomain(struct be_ctx *be_ctx, char *domain_name, struct sss_domain_info **dom) { diff --git a/src/providers/krb5/krb5_utils.h b/src/providers/krb5/krb5_utils.h index cdc9f23641905cff300077f708087e98ba683e0d..550ee3fd6837497f00280b0b98bd74ec2e07684e 100644 --- a/src/providers/krb5/krb5_utils.h +++ b/src/providers/krb5/krb5_utils.h @@ -95,7 +95,7 @@ errno_t cc_dir_create(const char *location, pcre *illegal_re, #endif /* HAVE_KRB5_CC_COLLECTION */ -errno_t get_domain_or_subdomain(TALLOC_CTX *mem_ctx, struct be_ctx *be_ctx, +errno_t get_domain_or_subdomain(struct be_ctx *be_ctx, char *domain_name, struct sss_domain_info **dom); #endif /* __KRB5_UTILS_H__ */ -- 1.8.3.1
>From 4588cb3f09cc170e6c2b9fe8d0d7dd7c5ab7caea Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Thu, 29 Aug 2013 13:40:26 +0200 Subject: [PATCH 2/3] KRB: Remove unused function parameter Parameter "const char *princ" was unused in static function safe_remove_old_ccache_file --- src/providers/krb5/krb5_auth.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index 03b54cbbf4f7ad3e5a0e408f95d2811407e06d6b..9d794a465fd8ef94f40e791025d7812440f3f8fe 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -41,7 +41,6 @@ #include "providers/krb5/krb5_utils.h" static errno_t safe_remove_old_ccache_file(struct sss_krb5_cc_be *cc_be, - const char *princ, const char *old_ccache, const char *new_ccache) { @@ -1037,7 +1036,7 @@ static void krb5_auth_done(struct tevent_req *subreq) * used. */ if (pd->cmd == SSS_PAM_AUTHENTICATE && !kr->active_ccache) { if (kr->old_ccname != NULL) { - ret = safe_remove_old_ccache_file(kr->cc_be, kr->upn, + ret = safe_remove_old_ccache_file(kr->cc_be, kr->old_ccname, "dummy"); if (ret != EOK) { DEBUG(1, ("Failed to remove old ccache file [%s], " @@ -1114,7 +1113,7 @@ static void krb5_auth_done(struct tevent_req *subreq) goto done; } - ret = safe_remove_old_ccache_file(kr->cc_be, kr->upn, + ret = safe_remove_old_ccache_file(kr->cc_be, kr->old_ccname, store_ccname); if (ret != EOK) { DEBUG(SSSDBG_MINOR_FAILURE, -- 1.8.3.1
>From 72b6ca4dc40f6b0533a04a756949fccce1603219 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik <[email protected]> Date: Thu, 29 Aug 2013 13:44:16 +0200 Subject: [PATCH 3/3] KRB: Remove unused function parameters Parameter "int *dp_err" and parameter "int *pam_status" were unused in static function krb5_auth_prepare_ccache_name. --- src/providers/krb5/krb5_auth.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index 9d794a465fd8ef94f40e791025d7812440f3f8fe..377db91abb83b2e5718c8763540fe55c67cc960e 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -315,8 +315,7 @@ static void krb5_auth_cache_creds(struct krb5_ctx *krb5_ctx, } static errno_t krb5_auth_prepare_ccache_name(struct krb5child_req *kr, - struct be_ctx *be_ctx, - int *pam_status, int *dp_err) + struct be_ctx *be_ctx) { const char *ccname_template; bool private_path = false; @@ -782,8 +781,7 @@ static void krb5_auth_resolve_done(struct tevent_req *subreq) } } - ret = krb5_auth_prepare_ccache_name(kr, state->be_ctx, - &state->pam_status, &state->dp_err); + ret = krb5_auth_prepare_ccache_name(kr, state->be_ctx); if (ret) { goto done; } -- 1.8.3.1
_______________________________________________ sssd-devel mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/sssd-devel
