diff options
| author | Simo Sorce <ssorce@redhat.com> | 2009-08-26 16:51:57 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2009-08-27 13:55:22 -0400 |
| commit | 61684e3e684855a72555c11a6de980b132676067 (patch) | |
| tree | c006dfbb9eed7afa54d33197111d6416cbc45091 /server/db | |
| parent | aa92e2ab85f14c42dc78a5c07209f58a1ef01538 (diff) | |
| download | sssd-61684e3e684855a72555c11a6de980b132676067.tar.gz sssd-61684e3e684855a72555c11a6de980b132676067.tar.xz sssd-61684e3e684855a72555c11a6de980b132676067.zip | |
Remove redunant function and always pass attrs.
Diffstat (limited to 'server/db')
| -rw-r--r-- | server/db/sysdb.h | 19 | ||||
| -rw-r--r-- | server/db/sysdb_ops.c | 40 |
2 files changed, 15 insertions, 44 deletions
diff --git a/server/db/sysdb.h b/server/db/sysdb.h index 70231f882..2f01ea685 100644 --- a/server/db/sysdb.h +++ b/server/db/sysdb.h @@ -449,29 +449,18 @@ struct tevent_req *sysdb_store_user_send(TALLOC_CTX *mem_ctx, uid_t uid, gid_t gid, const char *gecos, const char *homedir, - const char *shell); + const char *shell, + struct sysdb_attrs *attrs); int sysdb_store_user_recv(struct tevent_req *req); -struct tevent_req *sysdb_store_user_with_attrs_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct sysdb_handle *handle, - struct sss_domain_info *domain, - const char *name, - const char *pwd, - uid_t uid, gid_t gid, - const char *gecos, - const char *homedir, - const char *shell, - struct sysdb_attrs *attrs); -int sysdb_store_user_with_attrs_recv(struct tevent_req *req); - struct tevent_req *sysdb_store_group_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct sysdb_handle *handle, struct sss_domain_info *domain, const char *name, gid_t gid, - const char **members); + const char **members, + struct sysdb_attrs *attrs); int sysdb_store_group_recv(struct tevent_req *req); struct tevent_req *sysdb_add_group_member_send(TALLOC_CTX *mem_ctx, diff --git a/server/db/sysdb_ops.c b/server/db/sysdb_ops.c index a36b22fb5..57705275b 100644 --- a/server/db/sysdb_ops.c +++ b/server/db/sysdb_ops.c @@ -2563,24 +2563,8 @@ struct tevent_req *sysdb_store_user_send(TALLOC_CTX *mem_ctx, uid_t uid, gid_t gid, const char *gecos, const char *homedir, - const char *shell) -{ - return sysdb_store_user_with_attrs_send(mem_ctx, ev, handle, domain, - name, pwd, uid, gid, gecos, - homedir, shell, NULL); -} - -struct tevent_req *sysdb_store_user_with_attrs_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - struct sysdb_handle *handle, - struct sss_domain_info *domain, - const char *name, - const char *pwd, - uid_t uid, gid_t gid, - const char *gecos, - const char *homedir, - const char *shell, - struct sysdb_attrs *attrs) + const char *shell, + struct sysdb_attrs *attrs) { struct tevent_req *req, *subreq; struct sysdb_store_user_state *state; @@ -2776,11 +2760,6 @@ int sysdb_store_user_recv(struct tevent_req *req) return sysdb_op_default_recv(req); } -int sysdb_store_user_with_attrs_recv(struct tevent_req *req) -{ - return sysdb_op_default_recv(req); -} - /* =Store-Group-(Native/Legacy)-(replaces-existing-data)================== */ /* this function does not check that all user members are actually present */ @@ -2807,7 +2786,8 @@ struct tevent_req *sysdb_store_group_send(TALLOC_CTX *mem_ctx, struct sss_domain_info *domain, const char *name, gid_t gid, - const char **members) + const char **members, + struct sysdb_attrs *attrs) { struct tevent_req *req, *subreq; struct sysdb_store_group_state *state; @@ -2824,7 +2804,7 @@ struct tevent_req *sysdb_store_group_send(TALLOC_CTX *mem_ctx, state->name = name; state->gid = gid; state->members = members; - state->attrs = NULL; + state->attrs = attrs; subreq = sysdb_search_group_by_name_send(state, ev, NULL, handle, domain, name, src_attrs); @@ -2866,11 +2846,13 @@ static void sysdb_store_group_check(struct tevent_req *subreq) * group needs any update */ if (state->members) { - state->attrs = sysdb_new_attrs(state); if (!state->attrs) { - DEBUG(6, ("Error: Out of memory\n")); - tevent_req_error(req, ENOMEM); - return; + state->attrs = sysdb_new_attrs(state); + if (!state->attrs) { + DEBUG(6, ("Error: Out of memory\n")); + tevent_req_error(req, ENOMEM); + return; + } } for (i = 0; state->members[i]; i++) { |