From d2d513db74bfd26068e4ca2f202c2fa8f4292fa2 Mon Sep 17 00:00:00 2001
From: Rob Shearman <robertshearman@gmail.com>
Date: Thu, 14 Aug 2008 09:15:02 +0100
Subject: [PATCH] rpcrt4: Fix RpcBindingToStringBinding to not generate a UUID
 string if the object UUID is nil.

---
 dlls/rpcrt4/rpc_binding.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/rpcrt4/rpc_binding.c b/dlls/rpcrt4/rpc_binding.c
index a439bc371de..3f7c31b253f 100644
--- a/dlls/rpcrt4/rpc_binding.c
+++ b/dlls/rpcrt4/rpc_binding.c
@@ -816,8 +816,13 @@ RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, RPC_CS
 
   TRACE("(%p,%p)\n", Binding, StringBinding);
 
-  ret = UuidToStringA(&bind->ObjectUuid, &ObjectUuid);
-  if (ret != RPC_S_OK) return ret;
+  if (UuidIsNil(&bind->ObjectUuid, &ret))
+    ObjectUuid = NULL;
+  else
+  {
+    ret = UuidToStringA(&bind->ObjectUuid, &ObjectUuid);
+    if (ret != RPC_S_OK) return ret;
+  }
 
   ret = RpcStringBindingComposeA(ObjectUuid, (unsigned char*)bind->Protseq, (unsigned char*) bind->NetworkAddr,
                                  (unsigned char*) bind->Endpoint, NULL, StringBinding);