diff options
| author | Simo Sorce <simo@redhat.com> | 2013-01-07 20:03:33 -0500 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2013-01-15 10:53:01 +0100 |
| commit | 6ac396bebb4cd3124711d26dce54263f6f9c7c45 (patch) | |
| tree | c497a634c0e14ab3c55469f3669b1a0f9d5f3fc3 /src/providers | |
| parent | b7427d63bd328be32991f9d437c4a3d46bcabe03 (diff) | |
| download | sssd-6ac396bebb4cd3124711d26dce54263f6f9c7c45.tar.gz sssd-6ac396bebb4cd3124711d26dce54263f6f9c7c45.tar.bz2 sssd-6ac396bebb4cd3124711d26dce54263f6f9c7c45.zip | |
Add domain argument to sysdb_store_user()
Also remove sysdb_store_domuser()
Diffstat (limited to 'src/providers')
| -rw-r--r-- | src/providers/ipa/ipa_s2n_exop.c | 9 | ||||
| -rw-r--r-- | src/providers/ldap/sdap_async_users.c | 5 | ||||
| -rw-r--r-- | src/providers/proxy/proxy_id.c | 18 |
3 files changed, 16 insertions, 16 deletions
diff --git a/src/providers/ipa/ipa_s2n_exop.c b/src/providers/ipa/ipa_s2n_exop.c index 8fc22819..347a0606 100644 --- a/src/providers/ipa/ipa_s2n_exop.c +++ b/src/providers/ipa/ipa_s2n_exop.c @@ -684,11 +684,10 @@ static void ipa_s2n_get_user_done(struct tevent_req *subreq) goto done; } - ret = sysdb_store_domuser(state->dom, name, NULL, - attrs->a.user.pw_uid, - 0, NULL, /* gecos */ - homedir, NULL, - user_attrs, NULL, timeout, now); + ret = sysdb_store_user(state->dom->sysdb, state->dom, name, NULL, + attrs->a.user.pw_uid, 0, NULL, /* gecos */ + homedir, NULL, NULL, user_attrs, NULL, + timeout, now); break; case RESP_GROUP: /* we always use the fully qualified name for subdomain users */ diff --git a/src/providers/ldap/sdap_async_users.c b/src/providers/ldap/sdap_async_users.c index ade1d37b..cd577a7f 100644 --- a/src/providers/ldap/sdap_async_users.c +++ b/src/providers/ldap/sdap_async_users.c @@ -378,8 +378,9 @@ int sdap_save_user(TALLOC_CTX *memctx, DEBUG(6, ("Storing info for user %s\n", name)); - ret = sysdb_store_user(ctx, name, pwd, uid, gid, gecos, homedir, shell, - orig_dn, user_attrs, missing, cache_timeout, now); + ret = sysdb_store_user(ctx, dom, name, pwd, uid, gid, + gecos, homedir, shell, orig_dn, + user_attrs, missing, cache_timeout, now); if (ret) goto done; if (_usn_value) { diff --git a/src/providers/proxy/proxy_id.c b/src/providers/proxy/proxy_id.c index 57449417..76fbad45 100644 --- a/src/providers/proxy/proxy_id.c +++ b/src/providers/proxy/proxy_id.c @@ -27,8 +27,8 @@ /* =Getpwnam-wrapper======================================================*/ -static int save_user(struct sysdb_ctx *sysdb, bool lowercase, - struct passwd *pwd, const char *real_name, +static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, + bool lowercase, struct passwd *pwd, const char *real_name, const char *alias, uint64_t cache_timeout); static int @@ -131,7 +131,7 @@ static int get_pw_name(TALLOC_CTX *mem_ctx, } /* Both lookups went fine, we can save the user now */ - ret = save_user(sysdb, !dom->case_sensitive, pwd, + ret = save_user(sysdb, dom, !dom->case_sensitive, pwd, real_name, name, dom->user_timeout); done: @@ -210,8 +210,8 @@ delete_user(struct sysdb_ctx *sysdb, const char *name, uid_t uid) return ret; } -static int save_user(struct sysdb_ctx *sysdb, bool lowercase, - struct passwd *pwd, const char *real_name, +static int save_user(struct sysdb_ctx *sysdb, struct sss_domain_info *domain, + bool lowercase, struct passwd *pwd, const char *real_name, const char *alias, uint64_t cache_timeout) { const char *shell; @@ -265,7 +265,7 @@ static int save_user(struct sysdb_ctx *sysdb, bool lowercase, } } - ret = sysdb_store_user(sysdb, + ret = sysdb_store_user(sysdb, domain, real_name, pwd->pw_passwd, pwd->pw_uid, @@ -336,7 +336,7 @@ static int get_pw_uid(TALLOC_CTX *mem_ctx, goto done; } - ret = save_user(sysdb, !dom->case_sensitive, pwd, + ret = save_user(sysdb, dom, !dom->case_sensitive, pwd, pwd->pw_name, NULL, dom->user_timeout); done: @@ -458,7 +458,7 @@ static int enum_users(TALLOC_CTX *mem_ctx, break; } - ret = save_user(sysdb, !dom->case_sensitive, pwd, + ret = save_user(sysdb, dom, !dom->case_sensitive, pwd, pwd->pw_name, NULL, dom->user_timeout); if (ret) { /* Do not fail completely on errors. @@ -1224,7 +1224,7 @@ static int get_initgr(TALLOC_CTX *mem_ctx, goto done; } - ret = save_user(sysdb, !dom->case_sensitive, pwd, + ret = save_user(sysdb, dom, !dom->case_sensitive, pwd, real_name, name, dom->user_timeout); if (ret) { DEBUG(SSSDBG_OP_FAILURE, ("Could not save user\n")); |