summaryrefslogtreecommitdiff
path: root/source3/librpc
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2007-05-07 09:35:35 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:21:52 -0500
commite6383f47629368d9dd4e803f17566a24e9d7359e (patch)
treecebde89910087c3220786f209da2c4e32a71bc46 /source3/librpc
parentd1153fc79076741571b203b1d70f1536bde208f0 (diff)
downloadsamba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.gz
samba-e6383f47629368d9dd4e803f17566a24e9d7359e.tar.bz2
samba-e6383f47629368d9dd4e803f17566a24e9d7359e.zip
r22736: Start to merge the low-hanging fruit from the now 7000-line cluster patch.
This changes "struct process_id" to "struct server_id", keeping both is just too much hassle. No functional change (I hope ;-)) Volker (This used to be commit 0ad4b1226c9d91b72136310d3bbb640d2c5d67b8)
Diffstat (limited to 'source3/librpc')
-rw-r--r--source3/librpc/ndr/ndr_misc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/librpc/ndr/ndr_misc.c b/source3/librpc/ndr/ndr_misc.c
index 54face8d7a..a0796924a2 100644
--- a/source3/librpc/ndr/ndr_misc.c
+++ b/source3/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--;
}