r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch.

[samba.git] / source / librpc / ndr / ndr_misc.c

diff --git a/source/librpc/ndr/ndr_misc.c b/source/librpc/ndr/ndr_misc.c
index 54face8d7a03d3e38fb64b7272f74f4c7cc34d92..a0796924a2a916a19b41c0a434c4d69ff171bc99 100644 (file)
--- a/source/librpc/ndr/ndr_misc.c
+++ b/source/librpc/ndr/ndr_misc.c
@@ -243,7 +243,7 @@ NTSTATUS ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct se
        if (ndr_flags & NDR_SCALARS) {
                NDR_CHECK(ndr_push_align(ndr, 4));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS,
-                                         (uint32_t)r->id.pid));
+                                         (uint32_t)r->pid));
        }
        if (ndr_flags & NDR_BUFFERS) {
        }
@@ -256,7 +256,7 @@ NTSTATUS ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct server_i
                uint32_t pid;
                NDR_CHECK(ndr_pull_align(ndr, 4));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &pid));
-               r->id.pid = (pid_t)pid;
+               r->pid = (pid_t)pid;
        }
        if (ndr_flags & NDR_BUFFERS) {
        }
@@ -267,6 +267,6 @@ void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct s
 {
        ndr_print_struct(ndr, name, "server_id");
        ndr->depth++;
-       ndr_print_uint32(ndr, "id", (uint32_t)r->id.pid);
+       ndr_print_uint32(ndr, "id", (uint32_t)r->pid);
        ndr->depth--;
 }