sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-02 01:49:29 +03:00
Code Activity

r812: added a new samdb_replace() call that simplifies the code in the main samr server a bit.

Browse Source
This commit is contained in:
Andrew Tridgell
2004-05-22 00:53:57 +00:00
committed by Gerald (Jerry) Carter
parent 1418b667d9
commit 255d6e77e7
2 changed files with 27 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
source/rpc_server/samr/dcesrv_samr.c
View File

@ -1191,7 +1191,7 @@ static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
struct dcesrv_handle *h; struct dcesrv_handle *h;
struct samr_account_state *a_state; struct samr_account_state *a_state;
struct ldb_message mod, *msg = &mod; struct ldb_message mod, *msg = &mod;
int i, ret; int ret;
DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_GROUP); DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_GROUP);
@ -1219,13 +1219,8 @@ static NTSTATUS samr_SetGroupInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
return NT_STATUS_INVALID_INFO_CLASS; return NT_STATUS_INVALID_INFO_CLASS;
} }
/* mark all the message elements as LDB_FLAG_MOD_REPLACE */
for (i=0;i<mod.num_elements;i++) {
mod.elements[i].flags = LDB_FLAG_MOD_REPLACE;
}
/* modify the samdb record */ /* modify the samdb record */
ret = samdb_modify(a_state->sam_ctx, mem_ctx, &mod); ret = samdb_replace(a_state->sam_ctx, mem_ctx, &mod);
if (ret != 0) { if (ret != 0) {
/* we really need samdb.c to return NTSTATUS */ /* we really need samdb.c to return NTSTATUS */
return NT_STATUS_UNSUCCESSFUL; return NT_STATUS_UNSUCCESSFUL;
@ -1707,7 +1702,7 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
struct dcesrv_handle *h; struct dcesrv_handle *h;
struct samr_account_state *a_state; struct samr_account_state *a_state;
struct ldb_message mod, *msg = &mod; struct ldb_message mod, *msg = &mod;
int i, ret; int ret;
NTSTATUS status = NT_STATUS_OK; NTSTATUS status = NT_STATUS_OK;
DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_USER); DCESRV_PULL_HANDLE(h, r->in.handle, SAMR_HANDLE_USER);
@ -1812,16 +1807,8 @@ static NTSTATUS samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALLOC_CTX
return status; return status;
} }
/* mark all the message elements as LDB_FLAG_MOD_REPLACE,
unless they are already marked with some other flag */
for (i=0;i<mod.num_elements;i++) {
if (mod.elements[i].flags == 0) {
mod.elements[i].flags = LDB_FLAG_MOD_REPLACE;
}
}
/* modify the samdb record */ /* modify the samdb record */
ret = samdb_modify(a_state->sam_ctx, mem_ctx, msg); ret = samdb_replace(a_state->sam_ctx, mem_ctx, msg);
if (ret != 0) { if (ret != 0) {
/* we really need samdb.c to return NTSTATUS */ /* we really need samdb.c to return NTSTATUS */
return NT_STATUS_UNSUCCESSFUL; return NT_STATUS_UNSUCCESSFUL;
@ -1840,7 +1827,7 @@ static NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALL
struct dcesrv_handle *h; struct dcesrv_handle *h;
struct samr_account_state *a_state; struct samr_account_state *a_state;
struct ldb_message **res, mod, *msg; struct ldb_message **res, mod, *msg;
int i, ret; int ret;
struct samr_Hash *lmPwdHash=NULL, *ntPwdHash=NULL; struct samr_Hash *lmPwdHash=NULL, *ntPwdHash=NULL;
struct samr_Hash new_lmPwdHash, new_ntPwdHash, checkHash; struct samr_Hash new_lmPwdHash, new_ntPwdHash, checkHash;
NTSTATUS status = NT_STATUS_OK; NTSTATUS status = NT_STATUS_OK;
@ -1921,12 +1908,8 @@ static NTSTATUS samr_ChangePasswordUser(struct dcesrv_call_state *dce_call, TALL
return status; return status;
} }
for (i=0;i<mod.num_elements;i++) {
mod.elements[i].flags = LDB_FLAG_MOD_REPLACE;
}
/* modify the samdb record */ /* modify the samdb record */
ret = samdb_modify(a_state->sam_ctx, mem_ctx, &mod); ret = samdb_replace(a_state->sam_ctx, mem_ctx, &mod);
if (ret != 0) { if (ret != 0) {
return NT_STATUS_UNSUCCESSFUL; return NT_STATUS_UNSUCCESSFUL;
} }
@ -1946,7 +1929,7 @@ static NTSTATUS samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call,
struct samr_CryptPassword *pwbuf = r->in.password; struct samr_CryptPassword *pwbuf = r->in.password;
void *sam_ctx; void *sam_ctx;
const char *user_dn, *domain_dn; const char *user_dn, *domain_dn;
int ret, i; int ret;
struct ldb_message **res, mod; struct ldb_message **res, mod;
const char * const attrs[] = { "objectSid", "lmPwdHash", NULL }; const char * const attrs[] = { "objectSid", "lmPwdHash", NULL };
const char *domain_sid; const char *domain_sid;
@ -2027,13 +2010,8 @@ static NTSTATUS samr_OemChangePasswordUser2(struct dcesrv_call_state *dce_call,
return status; return status;
} }
/* mark all the message elements as LDB_FLAG_MOD_REPLACE */
for (i=0;i<mod.num_elements;i++) {
mod.elements[i].flags = LDB_FLAG_MOD_REPLACE;
}
/* modify the samdb record */ /* modify the samdb record */
ret = samdb_modify(sam_ctx, mem_ctx, &mod); ret = samdb_replace(sam_ctx, mem_ctx, &mod);
if (ret != 0) { if (ret != 0) {
samdb_close(sam_ctx); samdb_close(sam_ctx);
return NT_STATUS_UNSUCCESSFUL; return NT_STATUS_UNSUCCESSFUL;

20
source/rpc_server/samr/samdb.c
View File

@ -705,7 +705,9 @@ int samdb_msg_add_delete(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg
return -1; return -1;
} }
ldb_set_alloc(sam_ctx->ldb, samdb_alloc, mem_ctx); ldb_set_alloc(sam_ctx->ldb, samdb_alloc, mem_ctx);
return ldb_msg_add_empty(sam_ctx->ldb, msg, a, LDB_FLAG_MOD_DELETE); /* we use an empty replace rather than a delete, as it allows for
samdb_replace() to be used everywhere */
return ldb_msg_add_empty(sam_ctx->ldb, msg, a, LDB_FLAG_MOD_REPLACE);
} }
/* /*
@ -854,6 +856,22 @@ int samdb_modify(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
return ldb_modify(sam_ctx->ldb, msg); return ldb_modify(sam_ctx->ldb, msg);
} }
/*
replace elements in a record
*/
int samdb_replace(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg)
{
int i;
/* mark all the message elements as LDB_FLAG_MOD_REPLACE */
for (i=0;i<msg->num_elements;i++) {
msg->elements[i].flags = LDB_FLAG_MOD_REPLACE;
}
/* modify the samdb record */
return samdb_modify(ctx, mem_ctx, msg);
}
/* /*
check that a password is sufficiently complex check that a password is sufficiently complex
*/ */