diff options
| author | Stefan Metzmacher <metze@samba.org> | 2009-02-01 00:03:47 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2009-02-01 00:17:20 +0100 |
| commit | 5f13710ced2565355c3cdcef04067cacdf74a9ad (patch) | |
| tree | 577f87ed1495048eba1f5321f94e11581a42aa5c /source4/nbt_server | |
| parent | 96f176dbd84090fd18b8c796f869ddaa2da39e59 (diff) | |
| download | samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.gz samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.tar.xz samba-5f13710ced2565355c3cdcef04067cacdf74a9ad.zip | |
s4:irpc: avoid c++ reserved word 'private'
metze
Diffstat (limited to 'source4/nbt_server')
| -rw-r--r-- | source4/nbt_server/irpc.c | 5 | ||||
| -rw-r--r-- | source4/nbt_server/wins/winswack.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/nbt_server/irpc.c b/source4/nbt_server/irpc.c index fc61372ead8..748f18dcfdd 100644 --- a/source4/nbt_server/irpc.c +++ b/source4/nbt_server/irpc.c @@ -36,7 +36,8 @@ static NTSTATUS nbtd_information(struct irpc_message *msg, struct nbtd_information *r) { - struct nbtd_server *server = talloc_get_type(msg->private, struct nbtd_server); + struct nbtd_server *server = talloc_get_type(msg->private_data, + struct nbtd_server); switch (r->in.level) { case NBTD_INFO_STATISTICS: @@ -111,7 +112,7 @@ static NTSTATUS nbtd_getdcname(struct irpc_message *msg, struct nbtd_getdcname *req) { struct nbtd_server *server = - talloc_get_type(msg->private, struct nbtd_server); + talloc_get_type(msg->private_data, struct nbtd_server); struct nbtd_interface *iface = nbtd_find_request_iface(server, req->in.ip_address, true); struct getdc_state *s; struct nbt_netlogon_packet p; diff --git a/source4/nbt_server/wins/winswack.c b/source4/nbt_server/wins/winswack.c index c499889f9e4..c53fa1d069a 100644 --- a/source4/nbt_server/wins/winswack.c +++ b/source4/nbt_server/wins/winswack.c @@ -295,7 +295,7 @@ NTSTATUS nbtd_proxy_wins_challenge(struct irpc_message *msg, struct nbtd_proxy_wins_challenge *req) { struct nbtd_server *nbtd_server = - talloc_get_type(msg->private, struct nbtd_server); + talloc_get_type(msg->private_data, struct nbtd_server); struct proxy_wins_challenge_state *s; uint32_t i; @@ -355,7 +355,7 @@ NTSTATUS nbtd_proxy_wins_release_demand(struct irpc_message *msg, struct nbtd_proxy_wins_release_demand *req) { struct nbtd_server *nbtd_server = - talloc_get_type(msg->private, struct nbtd_server); + talloc_get_type(msg->private_data, struct nbtd_server); struct proxy_wins_release_demand_state *s; uint32_t i; |