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.

diff --git a/source/lib/socket_wrapper/socket_wrapper.c b/source/lib/socket_wrapper/socket_wrapper.c
index 336179d837ba9c1a2fa9948206cb1f290b6c3fab..33e4b3837029cc16367c0eb1d59363367a486758 100644 (file)
--- a/source/lib/socket_wrapper/socket_wrapper.c
+++ b/source/lib/socket_wrapper/socket_wrapper.c
@@ -750,7 +750,7 @@ static struct swrap_packet *swrap_packet_init(struct timeval *tval,
                                              int socket_type,
                                              const unsigned char *payload,
                                              size_t payload_len,
-                                             unsigned long tcp_seq,
+                                             unsigned long tcp_seqno,
                                              unsigned long tcp_ack,
                                              unsigned char tcp_ctl,
                                              int unreachable,
@@ -852,7 +852,7 @@ static struct swrap_packet *swrap_packet_init(struct timeval *tval,
        case SOCK_STREAM:
                packet->ip.p.tcp.source_port    = src_port;
                packet->ip.p.tcp.dest_port      = dest_port;
-               packet->ip.p.tcp.seq_num        = htonl(tcp_seq);
+               packet->ip.p.tcp.seq_num        = htonl(tcp_seqno);
                packet->ip.p.tcp.ack_num        = htonl(tcp_ack);
                packet->ip.p.tcp.hdr_length     = 0x50; /* 5 * 32 bit words */
                packet->ip.p.tcp.control        = tcp_ctl;
@@ -916,7 +916,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
 {
        const struct sockaddr_in *src_addr;
        const struct sockaddr_in *dest_addr;
-       unsigned long tcp_seq = 0;
+       unsigned long tcp_seqno = 0;
        unsigned long tcp_ack = 0;
        unsigned char tcp_ctl = 0;
        int unreachable = 0;
@@ -937,7 +937,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                src_addr = (const struct sockaddr_in *)si->myname;
                dest_addr = (const struct sockaddr_in *)addr;
 
-               tcp_seq = si->io.pck_snd;
+               tcp_seqno = si->io.pck_snd;
                tcp_ack = si->io.pck_rcv;
                tcp_ctl = 0x02; /* SYN */
 
@@ -951,7 +951,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                dest_addr = (const struct sockaddr_in *)si->myname;
                src_addr = (const struct sockaddr_in *)addr;
 
-               tcp_seq = si->io.pck_rcv;
+               tcp_seqno = si->io.pck_rcv;
                tcp_ack = si->io.pck_snd;
                tcp_ctl = 0x12; /** SYN,ACK */
 
@@ -966,7 +966,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                src_addr = (const struct sockaddr_in *)addr;
 
                /* Unreachable: resend the data of SWRAP_CONNECT_SEND */
-               tcp_seq = si->io.pck_snd - 1;
+               tcp_seqno = si->io.pck_snd - 1;
                tcp_ack = si->io.pck_rcv;
                tcp_ctl = 0x02; /* SYN */
                unreachable = 1;
@@ -979,7 +979,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                src_addr = (const struct sockaddr_in *)si->myname;
                dest_addr = (const struct sockaddr_in *)addr;
 
-               tcp_seq = si->io.pck_snd;
+               tcp_seqno = si->io.pck_snd;
                tcp_ack = si->io.pck_rcv;
                tcp_ctl = 0x10; /* ACK */
 
@@ -991,7 +991,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                dest_addr = (const struct sockaddr_in *)si->myname;
                src_addr = (const struct sockaddr_in *)addr;
 
-               tcp_seq = si->io.pck_rcv;
+               tcp_seqno = si->io.pck_rcv;
                tcp_ack = si->io.pck_snd;
                tcp_ctl = 0x02; /* SYN */
 
@@ -1005,7 +1005,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                src_addr = (const struct sockaddr_in *)si->myname;
                dest_addr = (const struct sockaddr_in *)addr;
 
-               tcp_seq = si->io.pck_snd;
+               tcp_seqno = si->io.pck_snd;
                tcp_ack = si->io.pck_rcv;
                tcp_ctl = 0x12; /* SYN,ACK */
 
@@ -1019,7 +1019,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                dest_addr = (const struct sockaddr_in *)si->myname;
                src_addr = (const struct sockaddr_in *)addr;
 
-               tcp_seq = si->io.pck_rcv;
+               tcp_seqno = si->io.pck_rcv;
                tcp_ack = si->io.pck_snd;
                tcp_ctl = 0x10; /* ACK */
 
@@ -1029,7 +1029,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                src_addr = (const struct sockaddr_in *)si->myname;
                dest_addr = (const struct sockaddr_in *)si->peername;
 
-               tcp_seq = si->io.pck_snd;
+               tcp_seqno = si->io.pck_snd;
                tcp_ack = si->io.pck_rcv;
                tcp_ctl = 0x18; /* PSH,ACK */
 
@@ -1047,7 +1047,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                                          buf, len, packet_len);
                }
 
-               tcp_seq = si->io.pck_rcv;
+               tcp_seqno = si->io.pck_rcv;
                tcp_ack = si->io.pck_snd;
                tcp_ctl = 0x14; /** RST,ACK */
 
@@ -1061,7 +1061,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                        return NULL;
                }
 
-               tcp_seq = si->io.pck_rcv;
+               tcp_seqno = si->io.pck_rcv;
                tcp_ack = si->io.pck_snd;
                tcp_ctl = 0x14; /* RST,ACK */
 
@@ -1071,7 +1071,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                dest_addr = (const struct sockaddr_in *)si->myname;
                src_addr = (const struct sockaddr_in *)si->peername;
 
-               tcp_seq = si->io.pck_rcv;
+               tcp_seqno = si->io.pck_rcv;
                tcp_ack = si->io.pck_snd;
                tcp_ctl = 0x18; /* PSH,ACK */
 
@@ -1087,7 +1087,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                        return NULL;
                }
 
-               tcp_seq = si->io.pck_rcv;
+               tcp_seqno = si->io.pck_rcv;
                tcp_ack = si->io.pck_snd;
                tcp_ctl = 0x14; /* RST,ACK */
 
@@ -1123,7 +1123,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                src_addr = (const struct sockaddr_in *)si->myname;
                dest_addr = (const struct sockaddr_in *)si->peername;
 
-               tcp_seq = si->io.pck_snd;
+               tcp_seqno = si->io.pck_snd;
                tcp_ack = si->io.pck_rcv;
                tcp_ctl = 0x11; /* FIN, ACK */
 
@@ -1137,7 +1137,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                dest_addr = (const struct sockaddr_in *)si->myname;
                src_addr = (const struct sockaddr_in *)si->peername;
 
-               tcp_seq = si->io.pck_rcv;
+               tcp_seqno = si->io.pck_rcv;
                tcp_ack = si->io.pck_snd;
                tcp_ctl = 0x11; /* FIN,ACK */
 
@@ -1151,7 +1151,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
                src_addr = (const struct sockaddr_in *)si->myname;
                dest_addr = (const struct sockaddr_in *)si->peername;
 
-               tcp_seq = si->io.pck_snd;
+               tcp_seqno = si->io.pck_snd;
                tcp_ack = si->io.pck_rcv;
                tcp_ctl = 0x10; /* ACK */
 
@@ -1164,7 +1164,7 @@ static struct swrap_packet *swrap_marshall_packet(struct socket_info *si,
 
        return swrap_packet_init(&tv, src_addr, dest_addr, si->type,
                                   (const unsigned char *)buf, len,
-                                  tcp_seq, tcp_ack, tcp_ctl, unreachable,
+                                  tcp_seqno, tcp_ack, tcp_ctl, unreachable,
                                   packet_len);
 }
 

diff --git a/source/librpc/gen_ndr/cli_initshutdown.c b/source/librpc/gen_ndr/cli_initshutdown.c
index d5e5ab63bc08113ca9c2889166c86554a14e3d0f..ab48623ee1bcd1282a9d647ae28e9eab2557d7f5 100644 (file)
--- a/source/librpc/gen_ndr/cli_initshutdown.c
+++ b/source/librpc/gen_ndr/cli_initshutdown.c
@@ -12,7 +12,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
                                  struct initshutdown_String *message /* [in] [unique] */,
                                  uint32_t timeout /* [in]  */,
                                  uint8_t force_apps /* [in]  */,
-                                 uint8_t reboot /* [in]  */,
+                                 uint8_t do_reboot /* [in]  */,
                                  WERROR *werror)
 {
        struct initshutdown_Init r;
@@ -23,7 +23,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
        r.in.message = message;
        r.in.timeout = timeout;
        r.in.force_apps = force_apps;
-       r.in.reboot = reboot;
+       r.in.do_reboot = do_reboot;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(initshutdown_Init, &r);
@@ -106,7 +106,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
                                    struct initshutdown_String *message /* [in] [unique] */,
                                    uint32_t timeout /* [in]  */,
                                    uint8_t force_apps /* [in]  */,
-                                   uint8_t reboot /* [in]  */,
+                                   uint8_t do_reboot /* [in]  */,
                                    uint32_t reason /* [in]  */,
                                    WERROR *werror)
 {
@@ -118,7 +118,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
        r.in.message = message;
        r.in.timeout = timeout;
        r.in.force_apps = force_apps;
-       r.in.reboot = reboot;
+       r.in.do_reboot = do_reboot;
        r.in.reason = reason;
 
        if (DEBUGLEVEL >= 10) {

diff --git a/source/librpc/gen_ndr/cli_initshutdown.h b/source/librpc/gen_ndr/cli_initshutdown.h
index 4223a35cfaadb8bee1f3458a173b8a39754c0776..c7d2cad664063811a1a949521af0a87a4dfaad1e 100644 (file)
--- a/source/librpc/gen_ndr/cli_initshutdown.h
+++ b/source/librpc/gen_ndr/cli_initshutdown.h
@@ -7,7 +7,7 @@ NTSTATUS rpccli_initshutdown_Init(struct rpc_pipe_client *cli,
                                  struct initshutdown_String *message /* [in] [unique] */,
                                  uint32_t timeout /* [in]  */,
                                  uint8_t force_apps /* [in]  */,
-                                 uint8_t reboot /* [in]  */,
+                                 uint8_t do_reboot /* [in]  */,
                                  WERROR *werror);
 NTSTATUS rpccli_initshutdown_Abort(struct rpc_pipe_client *cli,
                                   TALLOC_CTX *mem_ctx,
@@ -19,7 +19,7 @@ NTSTATUS rpccli_initshutdown_InitEx(struct rpc_pipe_client *cli,
                                    struct initshutdown_String *message /* [in] [unique] */,
                                    uint32_t timeout /* [in]  */,
                                    uint8_t force_apps /* [in]  */,
-                                   uint8_t reboot /* [in]  */,
+                                   uint8_t do_reboot /* [in]  */,
                                    uint32_t reason /* [in]  */,
                                    WERROR *werror);
 #endif /* __CLI_INITSHUTDOWN__ */

diff --git a/source/librpc/gen_ndr/cli_winreg.c b/source/librpc/gen_ndr/cli_winreg.c
index fe8c4f7726048fe25351d87c4df51c4b397845b8..29f7e50c45f0223404fdff6d3747a31656b032c0 100644 (file)
--- a/source/librpc/gen_ndr/cli_winreg.c
+++ b/source/librpc/gen_ndr/cli_winreg.c
@@ -1212,7 +1212,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
                                              struct initshutdown_String *message /* [in] [unique] */,
                                              uint32_t timeout /* [in]  */,
                                              uint8_t force_apps /* [in]  */,
-                                             uint8_t reboot /* [in]  */,
+                                             uint8_t do_reboot /* [in]  */,
                                              WERROR *werror)
 {
        struct winreg_InitiateSystemShutdown r;
@@ -1223,7 +1223,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
        r.in.message = message;
        r.in.timeout = timeout;
        r.in.force_apps = force_apps;
-       r.in.reboot = reboot;
+       r.in.do_reboot = do_reboot;
 
        if (DEBUGLEVEL >= 10) {
                NDR_PRINT_IN_DEBUG(winreg_InitiateSystemShutdown, &r);
@@ -1501,7 +1501,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
                                                struct initshutdown_String *message /* [in] [unique] */,
                                                uint32_t timeout /* [in]  */,
                                                uint8_t force_apps /* [in]  */,
-                                               uint8_t reboot /* [in]  */,
+                                               uint8_t do_reboot /* [in]  */,
                                                uint32_t reason /* [in]  */,
                                                WERROR *werror)
 {
@@ -1513,7 +1513,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
        r.in.message = message;
        r.in.timeout = timeout;
        r.in.force_apps = force_apps;
-       r.in.reboot = reboot;
+       r.in.do_reboot = do_reboot;
        r.in.reason = reason;
 
        if (DEBUGLEVEL >= 10) {

diff --git a/source/librpc/gen_ndr/cli_winreg.h b/source/librpc/gen_ndr/cli_winreg.h
index 8fc7610b0550ae051a1852ea94190dd49a5866f0..793a4ffc5b8f68299a182db1a88ba0e3a0ab4aa2 100644 (file)
--- a/source/librpc/gen_ndr/cli_winreg.h
+++ b/source/librpc/gen_ndr/cli_winreg.h
@@ -168,7 +168,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdown(struct rpc_pipe_client *cli,
                                              struct initshutdown_String *message /* [in] [unique] */,
                                              uint32_t timeout /* [in]  */,
                                              uint8_t force_apps /* [in]  */,
-                                             uint8_t reboot /* [in]  */,
+                                             uint8_t do_reboot /* [in]  */,
                                              WERROR *werror);
 NTSTATUS rpccli_winreg_AbortSystemShutdown(struct rpc_pipe_client *cli,
                                           TALLOC_CTX *mem_ctx,
@@ -205,7 +205,7 @@ NTSTATUS rpccli_winreg_InitiateSystemShutdownEx(struct rpc_pipe_client *cli,
                                                struct initshutdown_String *message /* [in] [unique] */,
                                                uint32_t timeout /* [in]  */,
                                                uint8_t force_apps /* [in]  */,
-                                               uint8_t reboot /* [in]  */,
+                                               uint8_t do_reboot /* [in]  */,
                                                uint32_t reason /* [in]  */,
                                                WERROR *werror);
 NTSTATUS rpccli_winreg_SaveKeyEx(struct rpc_pipe_client *cli,

diff --git a/source/librpc/gen_ndr/initshutdown.h b/source/librpc/gen_ndr/initshutdown.h
index acfe98846fd6d2574c6c06b23e11a5d6c3a45a6e..366f017c97fe21638f85be6e47f8c4ad5b362426 100644 (file)
--- a/source/librpc/gen_ndr/initshutdown.h
+++ b/source/librpc/gen_ndr/initshutdown.h
@@ -23,7 +23,7 @@ struct initshutdown_Init {
                struct initshutdown_String *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
        } in;
 
        struct {
@@ -51,7 +51,7 @@ struct initshutdown_InitEx {
                struct initshutdown_String *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
                uint32_t reason;
        } in;
 

diff --git a/source/librpc/gen_ndr/ndr_initshutdown.c b/source/librpc/gen_ndr/ndr_initshutdown.c
index 9d857feb82f5d64130451118fb98d3da1ab91165..5d6c0c3c08db560a587cf4f83f723fcef87355bc 100644 (file)
--- a/source/librpc/gen_ndr/ndr_initshutdown.c
+++ b/source/librpc/gen_ndr/ndr_initshutdown.c
@@ -116,7 +116,7 @@ static enum ndr_err_code ndr_push_initshutdown_Init(struct ndr_push *ndr, int fl
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
-               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot));
+               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
@@ -157,7 +157,7 @@ static enum ndr_err_code ndr_pull_initshutdown_Init(struct ndr_pull *ndr, int fl
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps));
-               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot));
+               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
@@ -189,7 +189,7 @@ _PUBLIC_ void ndr_print_initshutdown_Init(struct ndr_print *ndr, const char *nam
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
                ndr_print_uint8(ndr, "force_apps", r->in.force_apps);
-               ndr_print_uint8(ndr, "reboot", r->in.reboot);
+               ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot);
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
@@ -279,7 +279,7 @@ static enum ndr_err_code ndr_push_initshutdown_InitEx(struct ndr_push *ndr, int
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
-               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot));
+               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.reason));
        }
        if (flags & NDR_OUT) {
@@ -321,7 +321,7 @@ static enum ndr_err_code ndr_pull_initshutdown_InitEx(struct ndr_pull *ndr, int
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps));
-               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot));
+               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.reason));
        }
        if (flags & NDR_OUT) {
@@ -354,7 +354,7 @@ _PUBLIC_ void ndr_print_initshutdown_InitEx(struct ndr_print *ndr, const char *n
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
                ndr_print_uint8(ndr, "force_apps", r->in.force_apps);
-               ndr_print_uint8(ndr, "reboot", r->in.reboot);
+               ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot);
                ndr_print_uint32(ndr, "reason", r->in.reason);
                ndr->depth--;
        }

diff --git a/source/librpc/gen_ndr/ndr_winreg.c b/source/librpc/gen_ndr/ndr_winreg.c
index 1a861af29f26aa285d0caa66e442a2f8ae2f92b9..053e155616b1121dce9c572fcdd6a623a73c12e1 100644 (file)
--- a/source/librpc/gen_ndr/ndr_winreg.c
+++ b/source/librpc/gen_ndr/ndr_winreg.c
@@ -3185,7 +3185,7 @@ static enum ndr_err_code ndr_push_winreg_InitiateSystemShutdown(struct ndr_push
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
-               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot));
+               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_push_WERROR(ndr, NDR_SCALARS, r->out.result));
@@ -3226,7 +3226,7 @@ static enum ndr_err_code ndr_pull_winreg_InitiateSystemShutdown(struct ndr_pull
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps));
-               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot));
+               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot));
        }
        if (flags & NDR_OUT) {
                NDR_CHECK(ndr_pull_WERROR(ndr, NDR_SCALARS, &r->out.result));
@@ -3258,7 +3258,7 @@ _PUBLIC_ void ndr_print_winreg_InitiateSystemShutdown(struct ndr_print *ndr, con
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
                ndr_print_uint8(ndr, "force_apps", r->in.force_apps);
-               ndr_print_uint8(ndr, "reboot", r->in.reboot);
+               ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot);
                ndr->depth--;
        }
        if (flags & NDR_OUT) {
@@ -3876,7 +3876,7 @@ static enum ndr_err_code ndr_push_winreg_InitiateSystemShutdownEx(struct ndr_pus
                }
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.timeout));
                NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.force_apps));
-               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.reboot));
+               NDR_CHECK(ndr_push_uint8(ndr, NDR_SCALARS, r->in.do_reboot));
                NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, r->in.reason));
        }
        if (flags & NDR_OUT) {
@@ -3918,7 +3918,7 @@ static enum ndr_err_code ndr_pull_winreg_InitiateSystemShutdownEx(struct ndr_pul
                }
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.timeout));
                NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.force_apps));
-               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.reboot));
+               NDR_CHECK(ndr_pull_uint8(ndr, NDR_SCALARS, &r->in.do_reboot));
                NDR_CHECK(ndr_pull_uint32(ndr, NDR_SCALARS, &r->in.reason));
        }
        if (flags & NDR_OUT) {
@@ -3951,7 +3951,7 @@ _PUBLIC_ void ndr_print_winreg_InitiateSystemShutdownEx(struct ndr_print *ndr, c
                ndr->depth--;
                ndr_print_uint32(ndr, "timeout", r->in.timeout);
                ndr_print_uint8(ndr, "force_apps", r->in.force_apps);
-               ndr_print_uint8(ndr, "reboot", r->in.reboot);
+               ndr_print_uint8(ndr, "do_reboot", r->in.do_reboot);
                ndr_print_uint32(ndr, "reason", r->in.reason);
                ndr->depth--;
        }

diff --git a/source/librpc/gen_ndr/winreg.h b/source/librpc/gen_ndr/winreg.h
index e765890f7351207ec1d5dda53fc1a2a5813cbbd8..4a06e3bc833acac6331c46a27342133253d79050 100644 (file)
--- a/source/librpc/gen_ndr/winreg.h
+++ b/source/librpc/gen_ndr/winreg.h
@@ -479,7 +479,7 @@ struct winreg_InitiateSystemShutdown {
                struct initshutdown_String *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
        } in;
 
        struct {
@@ -567,7 +567,7 @@ struct winreg_InitiateSystemShutdownEx {
                struct initshutdown_String *message;/* [unique] */
                uint32_t timeout;
                uint8_t force_apps;
-               uint8_t reboot;
+               uint8_t do_reboot;
                uint32_t reason;
        } in;
 

diff --git a/source/librpc/idl/initshutdown.idl b/source/librpc/idl/initshutdown.idl
index 868e48e28a9efcce4683d10e92c8d54b94d4ea90..8815a9a29ea136d4730bd77704f156683f859306 100644 (file)
--- a/source/librpc/idl/initshutdown.idl
+++ b/source/librpc/idl/initshutdown.idl
@@ -28,7 +28,7 @@
                [in,unique] initshutdown_String *message,
                [in] uint32 timeout,
                [in] uint8 force_apps,
-               [in] uint8 reboot
+               [in] uint8 do_reboot
        );
 
        WERROR initshutdown_Abort(
@@ -40,7 +40,7 @@
                [in,unique] initshutdown_String *message,
                [in] uint32 timeout,
                [in] uint8 force_apps,
-               [in] uint8 reboot,
+               [in] uint8 do_reboot,
                [in] uint32 reason
        );
 }

diff --git a/source/librpc/idl/winreg.idl b/source/librpc/idl/winreg.idl
index 2183a2cb2d4d6076fb536c26c04b8c0ee4f0fca8..2f02419af50e5ed5c105f1ce093420d65d1a417c 100644 (file)
--- a/source/librpc/idl/winreg.idl
+++ b/source/librpc/idl/winreg.idl
@@ -307,7 +307,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
                [in,unique] initshutdown_String *message,
                [in]    uint32 timeout,
                [in]    uint8 force_apps,
-               [in]    uint8 reboot
+               [in]    uint8 do_reboot
        );
 
        /******************/
@@ -363,7 +363,7 @@ import "lsa.idl", "initshutdown.idl", "security.idl";
                [in,unique] initshutdown_String *message,
                [in] uint32 timeout,
                [in] uint8 force_apps,
-               [in] uint8 reboot,
+               [in] uint8 do_reboot,
                [in] uint32 reason
        );
 

diff --git a/source/rpc_server/srv_initshutdown_nt.c b/source/rpc_server/srv_initshutdown_nt.c
index f7d299830dff23c2167f52a6d7cef2d0d78b6f31..8b3ef522939463e6ac68f6188e288addc9a5495f 100644 (file)
--- a/source/rpc_server/srv_initshutdown_nt.c
+++ b/source/rpc_server/srv_initshutdown_nt.c
@@ -37,7 +37,7 @@ WERROR _initshutdown_Init(pipes_struct *p, struct initshutdown_Init *r)
        s.in.message = r->in.message;
        s.in.timeout = r->in.timeout;
        s.in.force_apps = r->in.force_apps;
-       s.in.reboot = r->in.reboot;
+       s.in.do_reboot = r->in.do_reboot;
        s.in.reason = 0;
 
        /* thunk down to _winreg_InitiateSystemShutdownEx() 
@@ -56,7 +56,7 @@ WERROR _initshutdown_InitEx(pipes_struct *p, struct initshutdown_InitEx *r)
        s.in.message = r->in.message;
        s.in.timeout = r->in.timeout;
        s.in.force_apps = r->in.force_apps;
-       s.in.reboot = r->in.reboot;
+       s.in.do_reboot = r->in.do_reboot;
        s.in.reason = r->in.reason;
 
        return _winreg_InitiateSystemShutdownEx( p, &s);

diff --git a/source/rpc_server/srv_winreg_nt.c b/source/rpc_server/srv_winreg_nt.c
index 84bcf0bf8921952682859123fb876828f25c2206..3991c5ae02470e7361dc7d4a83c075971f1134f1 100644 (file)
--- a/source/rpc_server/srv_winreg_nt.c
+++ b/source/rpc_server/srv_winreg_nt.c
@@ -475,7 +475,7 @@ WERROR _winreg_InitiateSystemShutdown(pipes_struct *p, struct winreg_InitiateSys
        s.in.message = r->in.message;
        s.in.timeout = r->in.timeout;
        s.in.force_apps = r->in.force_apps;
-       s.in.reboot = r->in.reboot;
+       s.in.do_reboot = r->in.do_reboot;
        s.in.reason = 0;
 
        /* thunk down to _winreg_InitiateSystemShutdownEx() 
@@ -499,7 +499,7 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS
        char *chkmsg = NULL;
        fstring str_timeout;
        fstring str_reason;
-       fstring reboot;
+       fstring do_reboot;
        fstring f;
        int ret;
        bool can_shutdown;
@@ -526,7 +526,7 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS
        }
 
        fstr_sprintf(str_timeout, "%d", r->in.timeout);
-       fstr_sprintf(reboot, r->in.reboot ? SHUTDOWN_R_STRING : "");
+       fstr_sprintf(do_reboot, r->in.do_reboot ? SHUTDOWN_R_STRING : "");
        fstr_sprintf(f, r->in.force_apps ? SHUTDOWN_F_STRING : "");
        fstr_sprintf(str_reason, "%d", r->in.reason );
 
@@ -541,7 +541,7 @@ WERROR _winreg_InitiateSystemShutdownEx(pipes_struct *p, struct winreg_InitiateS
                return WERR_NOMEM;
        }
        shutdown_script = talloc_all_string_sub(p->mem_ctx,
-                                               shutdown_script, "%r", reboot);
+                                               shutdown_script, "%r", do_reboot);
        if (!shutdown_script) {
                return WERR_NOMEM;
        }

diff --git a/source/utils/net_dom.c b/source/utils/net_dom.c
index d76a47b81d51c53b31dbf16f9b45487c4625b04e..6b8185a31d83bc2ec25aaa117c4906359be672c7 100644 (file)
--- a/source/utils/net_dom.c
+++ b/source/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;