From: Volker Lendecke Date: Tue, 17 Aug 2021 18:18:45 +0000 (+0200) Subject: rpc_server: Slightly simplify set_user_info_18() X-Git-Tag: ldb-2.5.0~880 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2154bb50f682fb0e2fe3b6216933ef4f66c62ab9;p=thirdparty%2Fsamba.git rpc_server: Slightly simplify set_user_info_18() Instead of adding the NULL check to data_blob_talloc_zero() put "out" on the stack. Signed-off-by: Volker Lendecke Reviewed-by: Jeremy Allison --- diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c index b4c72d901b3..14eeaa5cec5 100644 --- a/source3/rpc_server/samr/srv_samr_nt.c +++ b/source3/rpc_server/samr/srv_samr_nt.c @@ -4622,11 +4622,9 @@ static NTSTATUS set_user_info_18(struct samr_UserInfo18 *id18, } if (id18->nt_pwd_active) { - - DATA_BLOB in, out; - - in = data_blob_const(id18->nt_pwd.hash, 16); - out = data_blob_talloc_zero(mem_ctx, 16); + DATA_BLOB in = data_blob_const(id18->nt_pwd.hash, 16); + uint8_t outbuf[16] = { 0, }; + DATA_BLOB out = data_blob_const(outbuf, sizeof(outbuf)); rc = sess_crypt_blob(&out, &in, session_key, SAMBA_GNUTLS_DECRYPT); if (rc != 0) { @@ -4642,11 +4640,9 @@ static NTSTATUS set_user_info_18(struct samr_UserInfo18 *id18, } if (id18->lm_pwd_active) { - - DATA_BLOB in, out; - - in = data_blob_const(id18->lm_pwd.hash, 16); - out = data_blob_talloc_zero(mem_ctx, 16); + DATA_BLOB in = data_blob_const(id18->lm_pwd.hash, 16); + uint8_t outbuf[16] = { 0, }; + DATA_BLOB out = data_blob_const(outbuf, sizeof(outbuf)); rc = sess_crypt_blob(&out, &in, session_key, SAMBA_GNUTLS_DECRYPT); if (rc != 0) {