s4:rpc_server/lsa: only return collision_info if filled in lsaRSetForestTrustInformat...

If there're no collisions we should not fill the collision_info pointer.

Otherwise Windows fails to create a forest trust.

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Guenther Deschner <gd@samba.org>

diff --git a/source4/rpc_server/lsa/dcesrv_lsa.c b/source4/rpc_server/lsa/dcesrv_lsa.c
index b355eafeeca69fba5b5318f6ccb5ba2b4d35edb5..f31180e4e785f34271a4a121185b95447aa1f179 100644 (file)
--- a/source4/rpc_server/lsa/dcesrv_lsa.c
+++ b/source4/rpc_server/lsa/dcesrv_lsa.c
@@ -4524,7 +4524,9 @@ static NTSTATUS dcesrv_lsa_lsaRSetForestTrustInformation(struct dcesrv_call_stat
                }
        }
 
-       *r->out.collision_info = c_info;
+       if (c_info->count != 0) {
+               *r->out.collision_info = c_info;
+       }
 
        if (r->in.check_only != 0) {
                return NT_STATUS_OK;