summaryrefslogtreecommitdiffstats
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2014-02-20 16:53:51 +0100
committerStefan Metzmacher <metze@samba.org>2014-02-25 09:17:07 +0100
commitab7992b5bfa40d9cda66de319ded08276bb54e99 (patch)
treea2fa81ce05ee07048e57e1efe37b7cd0b73877c6 /source3
parent8fec421543ff25c99655acca801d363c416fd61d (diff)
downloadsamba-ab7992b5bfa40d9cda66de319ded08276bb54e99.tar.gz
samba-ab7992b5bfa40d9cda66de319ded08276bb54e99.tar.xz
samba-ab7992b5bfa40d9cda66de319ded08276bb54e99.zip
rpc: correctly tread domain-only requests in rpc_sid_to_name()
Bug: https://bugzilla.samba.org/show_bug.cgi?id=10463 Change-Id: I6a8a8c272b9cf7dbce4f9a99012209c29c31e839 Pair-Programmed-With: Gregor Beck <gbeck@sernet.de> Signed-off-by: Gregor Beck <gbeck@sernet.de> Signed-off-by: Michael Adam <obnox@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3')
-rw-r--r--source3/winbindd/winbindd_rpc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 0986d825d9a..916013efffe 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -371,7 +371,7 @@ NTSTATUS rpc_sid_to_name(TALLOC_CTX *mem_ctx,
} else {
*pname = talloc_strdup(mem_ctx, names[0]);
}
- if (*pname == NULL) {
+ if ((names[0] != NULL) && (*pname == NULL)) {
return NT_STATUS_NO_MEMORY;
}