messaging3: Move [un]become_root() calls out of messaging_dgm_send()

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index a7d5fbc0a7ec1b7d8928c21e8b223d863d8aaeee..06d05641e5033d17131623eda3979c0535cd2005 100644 (file)
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -471,8 +471,11 @@ NTSTATUS messaging_send_iov(struct messaging_context *msg_ctx,
                return NT_STATUS_OK;
        }
 
+       become_root();
        ret = messaging_dgm_send(msg_ctx->local, msg_ctx->id, server, msg_type,
                                 iov, iovlen);
+       unbecome_root();
+
        if (ret != 0) {
                return map_nt_error_from_unix(ret);
        }

diff --git a/source3/lib/messages_dgm.c b/source3/lib/messages_dgm.c
index e5da28552e38643dd5d3910a449fb1bc52750084..4e75ad048c331eeaaf29ce97d90ef8083687a2e7 100644 (file)
--- a/source3/lib/messages_dgm.c
+++ b/source3/lib/messages_dgm.c
@@ -318,9 +318,7 @@ int messaging_dgm_send(struct messaging_dgm_context *ctx,
        iov2[0].iov_len = sizeof(hdr);
        memcpy(iov2+1, iov, iovlen*sizeof(struct iovec));
 
-       become_root();
        ret = unix_msg_send(ctx->dgm_ctx, &dst, iov2, iovlen + 1);
-       unbecome_root();
 
        return ret;
 }