diff options
| author | Volker Lendecke <vl@samba.org> | 2014-07-10 10:36:02 +0000 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-07-22 15:32:39 +0200 |
| commit | f77caa3325570514dda20474b910218fd44d10a1 (patch) | |
| tree | a9fd0ff71ed92384c2a1a70b95e3dfcb56e161f7 | |
| parent | ff53cde795f160e0ee86ad17f09750c2ee2085f1 (diff) | |
| download | samba-f77caa3325570514dda20474b910218fd44d10a1.tar.gz samba-f77caa3325570514dda20474b910218fd44d10a1.tar.xz samba-f77caa3325570514dda20474b910218fd44d10a1.zip | |
smbd: Simplify unpack_nt_owners
The separate variables are not really required
Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
| -rw-r--r-- | source3/smbd/posix_acls.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 9584451b26..b9edf127e0 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -1166,9 +1166,6 @@ NTSTATUS unpack_nt_owners(struct connection_struct *conn, uint32 security_info_sent, const struct security_descriptor *psd) { - struct dom_sid owner_sid; - struct dom_sid grp_sid; - *puser = (uid_t)-1; *pgrp = (gid_t)-1; @@ -1181,9 +1178,6 @@ NTSTATUS unpack_nt_owners(struct connection_struct *conn, * Validate the owner and group SID's. */ - memset(&owner_sid, '\0', sizeof(owner_sid)); - memset(&grp_sid, '\0', sizeof(grp_sid)); - DEBUG(5,("unpack_nt_owners: validating owner_sids.\n")); /* @@ -1192,8 +1186,7 @@ NTSTATUS unpack_nt_owners(struct connection_struct *conn, */ if (security_info_sent & SECINFO_OWNER) { - sid_copy(&owner_sid, psd->owner_sid); - if (!sid_to_uid(&owner_sid, puser)) { + if (!sid_to_uid(psd->owner_sid, puser)) { if (lp_force_unknown_acl_user(SNUM(conn))) { /* this allows take ownership to work * reasonably */ @@ -1201,7 +1194,7 @@ NTSTATUS unpack_nt_owners(struct connection_struct *conn, } else { DEBUG(3,("unpack_nt_owners: unable to validate" " owner sid for %s\n", - sid_string_dbg(&owner_sid))); + sid_string_dbg(psd->owner_sid))); return NT_STATUS_INVALID_OWNER; } } @@ -1215,8 +1208,7 @@ NTSTATUS unpack_nt_owners(struct connection_struct *conn, */ if (security_info_sent & SECINFO_GROUP) { - sid_copy(&grp_sid, psd->group_sid); - if (!sid_to_gid( &grp_sid, pgrp)) { + if (!sid_to_gid(psd->group_sid, pgrp)) { if (lp_force_unknown_acl_user(SNUM(conn))) { /* this allows take group ownership to work * reasonably */ |