[SCM] Samba Shared Repository - branch master updated
Stefan Metzmacher
metze at samba.org
Thu May 12 12:03:04 UTC 2016
The branch, master has been updated
via 86dbdce s3:rpc_server/samr: simplify the logic in get_user_info_18()
from 7efbe11 s3:libsmb/clifile use correct value for MaxParameterCount for setting EAs
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 86dbdce3780ab4e3fda7501974810701f3816d48
Author: Stefan Metzmacher <metze at samba.org>
Date: Mon Mar 14 13:07:48 2016 +0100
s3:rpc_server/samr: simplify the logic in get_user_info_18()
We only allow SetUserInformation(level=18) via NCALRPC.
Signed-off-by: Stefan Metzmacher <metze at samba.org>
Reviewed-by: Volker Lendecke <vl at samba.org>
Reviewed-by: Jeremy Allison <jra at samba.org>
Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
Autobuild-Date(master): Thu May 12 14:02:27 CEST 2016 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_server/samr/srv_samr_nt.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_server/samr/srv_samr_nt.c b/source3/rpc_server/samr/srv_samr_nt.c
index 6354556..adc9e41 100644
--- a/source3/rpc_server/samr/srv_samr_nt.c
+++ b/source3/rpc_server/samr/srv_samr_nt.c
@@ -2617,21 +2617,14 @@ static NTSTATUS get_user_info_18(struct pipes_struct *p,
ZERO_STRUCTP(r);
- if (security_token_is_system(p->session_info->security_token)) {
- goto query;
- }
-
- if ((p->auth.auth_type != DCERPC_AUTH_TYPE_NTLMSSP) ||
- (p->auth.auth_type != DCERPC_AUTH_TYPE_KRB5) ||
- (p->auth.auth_type != DCERPC_AUTH_TYPE_SPNEGO)) {
- return NT_STATUS_ACCESS_DENIED;
+ if (p->transport != NCALRPC) {
+ return NT_STATUS_INVALID_INFO_CLASS;
}
- if (p->auth.auth_level != DCERPC_AUTH_LEVEL_PRIVACY) {
+ if (!security_token_is_system(p->session_info->security_token)) {
return NT_STATUS_ACCESS_DENIED;
}
- query:
/*
* Do *NOT* do become_root()/unbecome_root() here ! JRA.
*/
--
Samba Shared Repository
More information about the samba-cvs
mailing list