[SSSD] [PATCHES] KRB: Remove unused function parameters

Lukas Slebodnik lslebodn at redhat.com
Thu Sep 12 09:20:52 UTC 2013


On (29/08/13 10:22), Simo Sorce wrote:
>On Thu, 2013-08-29 at 16:15 +0200, Lukas Slebodnik wrote:
>> On (29/08/13 09:17), Simo Sorce wrote:
>> >On Thu, 2013-08-29 at 14:05 +0200, Lukas Slebodnik wrote:
>> >> 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.
>> >
>> >Please do not push these patches I am working in that area and I am
>> >completely changed for example the function in patch 2 [1] anyway (and
>> >yeah I also noticed princ was not used :)
>> >
>> >The other patches are probably going to be in the way as well.
>> >
>> >Simo.
>> >
>> >[1]
>> >http://fedorapeople.org/cgit/simo/public_git/sssd.git/commit/?h=ccname&id=be894d65471bb6de25623f01a02c606a20b76468
>> >
>> 
>> In this case, feel free to include patches to your work.
>
>ok
>
>Simo.
>

Updated patches are attached.

LS
-------------- next part --------------
>From e55358f0de9551b211ec3844fa824e0235f7b3eb Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Thu, 29 Aug 2013 13:37:32 +0200
Subject: [PATCH 1/2] 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 7cfa3e943c15c0f515f3372079cee18dd7978c92..f5ecd77ce28de660e9823dc70e964f77537a88c1 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -435,7 +435,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 e1daf6bfad86784f5a0ed228cd60f17691f84690..8d10a8346b89ac0ffd86c65d0b639150200a282d 100644
--- a/src/providers/krb5/krb5_utils.c
+++ b/src/providers/krb5/krb5_utils.c
@@ -1075,7 +1075,7 @@ done:
 }
 
 
-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 e41309e765b58f7cd2567f1d13fea30d093fd344..33cc6112b02af6991ef4aa4f1988dcbe08ed9266 100644
--- a/src/providers/krb5/krb5_utils.h
+++ b/src/providers/krb5/krb5_utils.h
@@ -69,7 +69,7 @@ errno_t get_ccache_file_data(const char *ccache_file, const char *client_name,
                              struct tgt_times *tgtt);
 
 
-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

-------------- next part --------------
>From de7dbc68276269f05f81cdd19f5e792ca77f4ba3 Mon Sep 17 00:00:00 2001
From: Lukas Slebodnik <lslebodn at redhat.com>
Date: Thu, 29 Aug 2013 13:44:16 +0200
Subject: [PATCH 2/2] 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 f5ecd77ce28de660e9823dc70e964f77537a88c1..fe3e6aba74d9bc22cbd313c6eaa6a085ba32431f 100644
--- a/src/providers/krb5/krb5_auth.c
+++ b/src/providers/krb5/krb5_auth.c
@@ -289,8 +289,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;
@@ -730,8 +729,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



More information about the sssd-devel mailing list