diff options
| author | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-10-13 00:48:15 +0200 |
|---|---|---|
| committer | Matthias Dieter Wallnöfer <mwallnoefer@yahoo.de> | 2009-10-13 00:53:47 +0200 |
| commit | 6b91a2ad8ebf6368c81eefdd225548e42a2ed0c4 (patch) | |
| tree | 3cb2b6bedfa9ad2a37cf495acac4e808bad87c50 /source4 | |
| parent | 7c53386adfb4658df11ed951614bbb7ec74af1cb (diff) | |
| download | samba-6b91a2ad8ebf6368c81eefdd225548e42a2ed0c4.tar.gz samba-6b91a2ad8ebf6368c81eefdd225548e42a2ed0c4.tar.bz2 samba-6b91a2ad8ebf6368c81eefdd225548e42a2ed0c4.zip | |
s4:dcesrv_samr - prevent "ldb_modify" on a possibly empty message
In this code part under certain circumstances we can end up with an empty message.
Since our new behaviour denies them (like the real AD) we need to bypass them
on LDB modify calls.
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/rpc_server/samr/dcesrv_samr.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c index b73add66c9..00820a3ab2 100644 --- a/source4/rpc_server/samr/dcesrv_samr.c +++ b/source4/rpc_server/samr/dcesrv_samr.c @@ -3611,14 +3611,16 @@ static NTSTATUS dcesrv_samr_SetUserInfo(struct dcesrv_call_state *dce_call, TALL } /* modify the samdb record */ - ret = ldb_modify(a_state->sam_ctx, msg); - if (ret != LDB_SUCCESS) { - DEBUG(1,("Failed to modify record %s: %s\n", - ldb_dn_get_linearized(a_state->account_dn), - ldb_errstring(a_state->sam_ctx))); - - /* we really need samdb.c to return NTSTATUS */ - return NT_STATUS_UNSUCCESSFUL; + if (msg->num_elements > 0) { + ret = ldb_modify(a_state->sam_ctx, msg); + if (ret != LDB_SUCCESS) { + DEBUG(1,("Failed to modify record %s: %s\n", + ldb_dn_get_linearized(a_state->account_dn), + ldb_errstring(a_state->sam_ctx))); + + /* we really need samdb.c to return NTSTATUS */ + return NT_STATUS_UNSUCCESSFUL; + } } return NT_STATUS_OK; |