From: Volker Lendecke <vl@samba.org>
Date: Sun, 9 Aug 2009 11:17:35 +0000 (-0400)
Subject: s3:winbind: Simplify _wbint_[GU]id2Sid
X-Git-Tag: tevent-0.9.8~380
X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=6d100a6b20842cc950e85381908d3a2098f481e6;ds=sidebyside

s3:winbind: Simplify _wbint_[GU]id2Sid
---

diff --git a/source3/winbindd/winbindd_dual_srv.c b/source3/winbindd/winbindd_dual_srv.c
index 9be295ffdca..23d3de13a78 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)