From 6d100a6b20842cc950e85381908d3a2098f481e6 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 9 Aug 2009 07:17:35 -0400 Subject: [PATCH] s3:winbind: Simplify _wbint_[GU]id2Sid --- source3/winbindd/winbindd_dual_srv.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c index 9be295ffdca4..23d3de13a785 100644 --- a/source3/winbindd/winbindd_dual_srv.c +++ b/source3/winbindd/winbindd_dual_srv.c @@ -96,26 +96,14 @@ NTSTATUS _wbint_Sid2Gid(pipes_struct *p, struct wbint_Sid2Gid *r) NTSTATUS _wbint_Uid2Sid(pipes_struct *p, struct wbint_Uid2Sid *r) { - NTSTATUS status; - - status = idmap_uid_to_sid(r->in.dom_name ? r->in.dom_name : "", - r->out.sid, r->in.uid); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - return NT_STATUS_OK; + return idmap_uid_to_sid(r->in.dom_name ? r->in.dom_name : "", + r->out.sid, r->in.uid); } NTSTATUS _wbint_Gid2Sid(pipes_struct *p, struct wbint_Gid2Sid *r) { - NTSTATUS status; - - status = idmap_gid_to_sid(r->in.dom_name ? r->in.dom_name : "", - r->out.sid, r->in.gid); - if (!NT_STATUS_IS_OK(status)) { - return status; - } - return NT_STATUS_OK; + return idmap_gid_to_sid(r->in.dom_name ? r->in.dom_name : "", + r->out.sid, r->in.gid); } NTSTATUS _wbint_QueryUser(pipes_struct *p, struct wbint_QueryUser *r) -- 2.34.1