From 8a1738f9379a1b8fb5c95c3df649e014ff5a1434 Mon Sep 17 00:00:00 2001 From: Jan Zeleny Date: Wed, 18 May 2011 10:06:19 -0400 Subject: sysdb refactoring: deleted domain variables in sysdb API The patch also updates code using modified functions. Tests have also been adjusted. --- src/providers/krb5/krb5_access.c | 4 ++-- src/providers/krb5/krb5_auth.c | 16 +++++++--------- src/providers/krb5/krb5_renew_tgt.c | 3 +-- 3 files changed, 10 insertions(+), 13 deletions(-) (limited to 'src/providers/krb5') diff --git a/src/providers/krb5/krb5_access.c b/src/providers/krb5/krb5_access.c index 4becd03c5..afa3a89df 100644 --- a/src/providers/krb5/krb5_access.c +++ b/src/providers/krb5/krb5_access.c @@ -87,8 +87,8 @@ struct tevent_req *krb5_access_send(TALLOC_CTX *mem_ctx, attrs[2] = SYSDB_GIDNUM; attrs[3] = NULL; - ret = sysdb_get_user_attr(state, be_ctx->sysdb, be_ctx->domain, - state->pd->user, attrs, &res); + ret = sysdb_get_user_attr(state, be_ctx->sysdb, state->pd->user, attrs, + &res); if (ret) { DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user)); goto done; diff --git a/src/providers/krb5/krb5_auth.c b/src/providers/krb5/krb5_auth.c index a7444d30f..c8dc86526 100644 --- a/src/providers/krb5/krb5_auth.c +++ b/src/providers/krb5/krb5_auth.c @@ -193,8 +193,7 @@ static int krb5_mod_ccname(TALLOC_CTX *mem_ctx, goto done; } - ret = sysdb_set_user_attr(tmpctx, sysdb, - domain, name, attrs, mod_op); + ret = sysdb_set_user_attr(tmpctx, sysdb, name, attrs, mod_op); if (ret != EOK) { DEBUG(6, ("Error: %d (%s)\n", ret, strerror(ret))); sysdb_transaction_cancel(sysdb); @@ -408,8 +407,8 @@ struct tevent_req *krb5_auth_send(TALLOC_CTX *mem_ctx, } kr = state->kr; - ret = sysdb_get_user_attr(state, be_ctx->sysdb, be_ctx->domain, - state->pd->user, attrs, &res); + ret = sysdb_get_user_attr(state, be_ctx->sysdb, state->pd->user, attrs, + &res); if (ret) { DEBUG(5, ("sysdb search for upn of user [%s] failed.\n", pd->user)); state->pam_status = PAM_SYSTEM_ERR; @@ -1084,8 +1083,7 @@ static void krb5_save_ccname_done(struct tevent_req *req) talloc_set_destructor((TALLOC_CTX *)password, password_destructor); - ret = sysdb_cache_password(state, state->be_ctx->sysdb, - state->be_ctx->domain, pd->user, + ret = sysdb_cache_password(state, state->be_ctx->sysdb, pd->user, password); if (ret) { DEBUG(2, ("Failed to cache password, offline auth may not work." @@ -1114,9 +1112,9 @@ static void krb5_pam_handler_cache_auth_step(struct tevent_req *req) struct krb5_ctx *krb5_ctx = state->kr->krb5_ctx; int ret; - ret = sysdb_cache_auth(state, state->be_ctx->sysdb, state->be_ctx->domain, - pd->user, pd->authtok, pd->authtok_size, - state->be_ctx->cdb, true, NULL, NULL); + ret = sysdb_cache_auth(state, state->be_ctx->sysdb, pd->user, pd->authtok, + pd->authtok_size, state->be_ctx->cdb, true, NULL, + NULL); if (ret != EOK) { DEBUG(1, ("Offline authentication failed\n")); state->pam_status = PAM_SYSTEM_ERR; diff --git a/src/providers/krb5/krb5_renew_tgt.c b/src/providers/krb5/krb5_renew_tgt.c index 557ec3e1d..2ad5592e9 100644 --- a/src/providers/krb5/krb5_renew_tgt.c +++ b/src/providers/krb5/krb5_renew_tgt.c @@ -390,8 +390,7 @@ static errno_t check_ccache_files(struct renew_tgt_ctx *renew_tgt_ctx) } ret = sysdb_search_users(tmp_ctx, renew_tgt_ctx->be_ctx->sysdb, - renew_tgt_ctx->be_ctx->domain, ccache_filter, - ccache_attrs, &msgs_count, &msgs); + ccache_filter, ccache_attrs, &msgs_count, &msgs); if (ret != EOK) { DEBUG(1, ("sysdb_search_users failed.\n")); goto done; -- cgit