The branch, master has been updated via 41827cc auth3: Simplify get_system_info3 via e4058d8 auth3: Fix some whitespace from 3c557ab repl_meta_data: Remove handling of backlinks from replmd_prepare_commit()
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 41827cc81241599354e3d176830818ec32315d6c Author: Volker Lendecke <v...@samba.org> Date: Mon Feb 13 21:33:57 2017 +0100 auth3: Simplify get_system_info3 We have global_sid_System, so we don't need to dom_sid_parse("S-1-5-18"); Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Mon Feb 27 11:31:53 CET 2017 on sn-devel-144 commit e4058d81b3f99b1305879c4d1f97e2273ef99e66 Author: Volker Lendecke <v...@samba.org> Date: Mon Feb 13 20:47:59 2017 +0100 auth3: Fix some whitespace Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/auth/auth_util.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index ae6bfb3..5d9f0e0 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -718,7 +718,6 @@ static NTSTATUS get_system_info3(TALLOC_CTX *mem_ctx, struct netr_SamInfo3 *info3) { NTSTATUS status; - struct dom_sid *system_sid; /* Set account name */ init_lsa_String(&info3->base.account_name, "SYSTEM"); @@ -727,21 +726,13 @@ static NTSTATUS get_system_info3(TALLOC_CTX *mem_ctx, init_lsa_StringLarge(&info3->base.logon_domain, "NT AUTHORITY"); - /* The SID set here will be overwirtten anyway, but try and make it SID_NT_SYSTEM anyway */ - /* Domain sid is NT_AUTHORITY */ - - system_sid = dom_sid_parse_talloc(mem_ctx, SID_NT_SYSTEM); - if (system_sid == NULL) { - return NT_STATUS_NO_MEMORY; - } - - status = dom_sid_split_rid(mem_ctx, system_sid, &info3->base.domain_sid, + status = dom_sid_split_rid(mem_ctx, &global_sid_System, + &info3->base.domain_sid, &info3->base.rid); - TALLOC_FREE(system_sid); if (!NT_STATUS_IS_OK(status)) { return status; } - + /* Primary gid is the same */ info3->base.primary_gid = info3->base.rid; -- Samba Shared Repository