diff options
| author | Zach Loafman <zachary.loafman@isilon.com> | 2008-07-03 12:21:33 -0700 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-07-22 15:00:48 +0200 |
| commit | 863a6aa07e543e30f2075a597129f6c39222beef (patch) | |
| tree | cc6baa5ff81890025dfb33624852ecb2ae6d3add /source3/utils | |
| parent | 06d0790c0799112b89534a646e78d0cb38b06e20 (diff) | |
| download | samba-863a6aa07e543e30f2075a597129f6c39222beef.tar.gz samba-863a6aa07e543e30f2075a597129f6c39222beef.tar.bz2 samba-863a6aa07e543e30f2075a597129f6c39222beef.zip | |
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)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/net_dom.c | 16 |
1 files changed, 8 insertions, 8 deletions
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; |