From 863a6aa07e543e30f2075a597129f6c39222beef Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 3 Jul 2008 12:21:33 -0700 Subject: Fix warnings on FreeBSD-based platforms Fix two shadowed declaration warnings on FreeBSD-based platform: 'reboot' is a 4.0BSD syscall in unistd.h and 'tcp_seq' is a typedef in netinet/tcp.h. (This used to be commit 14d2a4da1da38d6f69c63505d35990322f253e5d) --- source3/utils/net_dom.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/utils') diff --git a/source3/utils/net_dom.c b/source3/utils/net_dom.c index d76a47b81d..6b8185a31d 100644 --- a/source3/utils/net_dom.c +++ b/source3/utils/net_dom.c @@ -40,7 +40,7 @@ static int net_dom_unjoin(struct net_context *c, int argc, const char **argv) uint32_t unjoin_flags = WKSSVC_JOIN_FLAGS_ACCOUNT_DELETE | WKSSVC_JOIN_FLAGS_JOIN_TYPE; struct cli_state *cli = NULL; - bool reboot = false; + bool do_reboot = false; NTSTATUS ntstatus; NET_API_STATUS status; int ret = -1; @@ -68,11 +68,11 @@ static int net_dom_unjoin(struct net_context *c, int argc, const char **argv) } } if (strequal(argv[i], "reboot")) { - reboot = true; + do_reboot = true; } } - if (reboot) { + if (do_reboot) { ntstatus = net_make_ipc_connection_ex(c, c->opt_workgroup, server_name, NULL, 0, &cli); @@ -88,7 +88,7 @@ static int net_dom_unjoin(struct net_context *c, int argc, const char **argv) goto done; } - if (reboot) { + if (do_reboot) { c->opt_comment = "Shutting down due to a domain membership " "change"; c->opt_reboot = true; @@ -128,7 +128,7 @@ static int net_dom_join(struct net_context *c, int argc, const char **argv) uint32_t join_flags = WKSSVC_JOIN_FLAGS_ACCOUNT_CREATE | WKSSVC_JOIN_FLAGS_JOIN_TYPE; struct cli_state *cli = NULL; - bool reboot = false; + bool do_reboot = false; NTSTATUS ntstatus; NET_API_STATUS status; int ret = -1; @@ -172,11 +172,11 @@ static int net_dom_join(struct net_context *c, int argc, const char **argv) } } if (strequal(argv[i], "reboot")) { - reboot = true; + do_reboot = true; } } - if (reboot) { + if (do_reboot) { ntstatus = net_make_ipc_connection_ex(c, c->opt_workgroup, server_name, NULL, 0, &cli); @@ -195,7 +195,7 @@ static int net_dom_join(struct net_context *c, int argc, const char **argv) goto done; } - if (reboot) { + if (do_reboot) { c->opt_comment = "Shutting down due to a domain membership " "change"; c->opt_reboot = true; -- cgit