[SCM] Samba Shared Repository - branch v3-3-test updated -
release-3-2-0pre2-3390-g591bf1d
Volker Lendecke
vlendec at samba.org
Tue Jul 22 13:01:10 GMT 2008
The branch, v3-3-test has been updated
via 591bf1d15ff3b93db908cc3a4b6e10d09e5b74b6 (commit)
via 0acc888ca91a7401c5e54388c58272e263f73069 (commit)
via 14d2a4da1da38d6f69c63505d35990322f253e5d (commit)
via 6b73f259cb67d9dda9127907d706f9244a871fa3 (commit)
via 10a2ab40771b7d0222f339a87a45630a23ce4788 (commit)
from 27ce662f5d4e1185cedc59c52f94458fb6425f5c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-test
- Log -----------------------------------------------------------------
commit 591bf1d15ff3b93db908cc3a4b6e10d09e5b74b6
Author: Zach Loafman <zachary.loafman at isilon.com>
Date: Thu Jul 3 11:52:53 2008 -0700
Check for f_frsize when using statvfs
Add a configure test for the availability of f_frsize in struct statvfs
(for broken platforms that define statvfs but still have
f_bsize/f_iosize). Also add sys/types.h to the other struct statvfs test
(again, some platforms need it).
commit 0acc888ca91a7401c5e54388c58272e263f73069
Author: Zach Loafman <zachary.loafman at isilon.com>
Date: Wed Jul 9 00:05:50 2008 -0700
Make DSO_EXPORTS_CMD regexp more POSIX compliant
The FreeBSD sed command doesn't understand \? without passing -E to turn
on extended regexps. This patch changes the DSO_EXPORTS_CMD regexp to a
POSIX compliant RE by switching the \+ to a \{1,\} bound and the \? to a
\{0,1\} bound.
commit 14d2a4da1da38d6f69c63505d35990322f253e5d
Author: Zach Loafman <zachary.loafman at isilon.com>
Date: Thu Jul 3 12:21:33 2008 -0700
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.
commit 6b73f259cb67d9dda9127907d706f9244a871fa3
Author: Zach Loafman <zachary.loafman at isilon.com>
Date: Thu Jul 3 22:53:42 2008 -0700
Fix various build warnings
This fixes various build warnings on our platform. I'm sure I haven't
caught them all, but it's a start.
commit 10a2ab40771b7d0222f339a87a45630a23ce4788
Author: Zach Loafman <zachary.loafman at isilon.com>
Date: Thu Jul 3 13:45:07 2008 -0700
Add --enable-picky-developer
This adds an --enable-picky-developer option that will halt compilation
on warnings. Yes, this could be handled by a direct Makefile change, but
people should be encourage to do it!
-----------------------------------------------------------------------
Summary of changes:
source/Makefile.in | 6 ++--
source/auth/auth_server.c | 2 +-
source/configure.in | 19 ++++++++++++-
source/lib/fsusage.c | 5 +++
source/lib/iconv.c | 2 +-
source/lib/sendfile.c | 3 +-
source/lib/socket_wrapper/socket_wrapper.c | 38 ++++++++++++++--------------
source/lib/util_sock.c | 4 +-
source/librpc/gen_ndr/cli_initshutdown.c | 8 +++---
source/librpc/gen_ndr/cli_initshutdown.h | 4 +-
source/librpc/gen_ndr/cli_winreg.c | 8 +++---
source/librpc/gen_ndr/cli_winreg.h | 4 +-
source/librpc/gen_ndr/initshutdown.h | 4 +-
source/librpc/gen_ndr/ndr_initshutdown.c | 12 ++++----
source/librpc/gen_ndr/ndr_winreg.c | 12 ++++----
source/librpc/gen_ndr/winreg.h | 4 +-
source/librpc/idl/initshutdown.idl | 4 +-
source/librpc/idl/winreg.idl | 4 +-
source/m4/check_path.m4 | 8 ++++++
source/nsswitch/libwbclient/wbc_sid.c | 2 +-
source/rpc_server/srv_initshutdown_nt.c | 4 +-
source/rpc_server/srv_winreg_nt.c | 8 +++---
source/smbd/utmp.c | 3 +-
source/utils/net_dom.c | 16 ++++++------
source/winbindd/winbindd_pam.c | 36 ++++++++++----------------
25 files changed, 121 insertions(+), 99 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile.in b/source/Makefile.in
index 72aa9a5..5dbac10 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -25,7 +25,7 @@ SHLD=@SHLD@
LIB_PATH_VAR=@LIB_PATH_VAR@
## Dynamic shared libraries build settings
-DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\+\)\?$$/@SYMSEXT@/'`
+DSO_EXPORTS_CMD=-Wl,--version-script,$(srcdir)/exports/`basename $@ | sed 's/@SHLIBEXT@\(.[0-9]\{1,\}\)\{0,1\}$$/@SYMSEXT@/'`
DSO_EXPORTS=@DSO_EXPORTS@
SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
@@ -34,8 +34,8 @@ SHLD_DSO = $(SHLD) $(LDSHFLAGS) $(DSO_EXPORTS) -o $@
MODULE_EXPORTS=@MODULE_EXPORTS@
# Add $(DEVELOPER_CFLAGS) to $(CFLAGS) to enable extra compiler
-# (GCC) warnings. This is done automtically for --enable-developer
-# and --enable-krb5developer.
+# (GCC) warnings. This is done automtically for --enable-developer,
+# --enable-picky-developer and --enable-krb5developer.
DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@
CFLAGS=@CFLAGS@
CPPFLAGS=-DHAVE_CONFIG_H @CPPFLAGS@
diff --git a/source/auth/auth_server.c b/source/auth/auth_server.c
index 31d1d37..696b426 100644
--- a/source/auth/auth_server.c
+++ b/source/auth/auth_server.c
@@ -37,7 +37,7 @@ static struct cli_state *server_cryptkey(TALLOC_CTX *mem_ctx)
const char *p;
char *pserver = NULL;
bool connected_ok = False;
- struct named_mutex *mutex;
+ struct named_mutex *mutex = NULL;
if (!(cli = cli_initialise()))
return NULL;
diff --git a/source/configure.in b/source/configure.in
index cb0e37e..6806ed2 100644
--- a/source/configure.in
+++ b/source/configure.in
@@ -183,6 +183,10 @@ if test x"$ac_cv_prog_gcc" = x"yes" ; then
if test x"$krb5_developer" != x"$yes" ; then
DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Wstrict-prototypes"
fi
+
+ if test x"$picky_developer" = x"yes"; then
+ DEVELOPER_CFLAGS="$DEVELOPER_CFLAGS -Werror"
+ fi
fi
AC_ARG_ENABLE(dmalloc, [AS_HELP_STRING([--enable-dmalloc], [Enable heap debugging [default=no]])])
@@ -4751,12 +4755,23 @@ fi
# This is not the case on ancient Linux systems.
AC_CACHE_CHECK([that statvfs.f_fsid is an integer],samba_cv_fsid_int, [
- AC_TRY_COMPILE([#include <sys/statvfs.h>],[struct statvfs buf; buf.f_fsid = 0],
+ AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/statvfs.h>],[struct statvfs buf; buf.f_fsid = 0],
samba_cv_fsid_int=yes,samba_cv_fsid_int=no)])
if test x"$samba_cv_fsid_int" = x"yes"; then
AC_DEFINE(HAVE_FSID_INT, 1, [Whether statvfs.f_fsid is an integer])
fi
+# fsusage.c assumes that statvfs has an f_frsize entry. Some weird
+# systems use f_bsize.
+AC_CACHE_CHECK([that statvfs.f_frsize works],samba_cv_frsize, [
+ AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/statvfs.h>],[struct statvfs buf; buf.f_frsize = 0],
+ samba_cv_frsize=yes,samba_cv_frsize=no)])
+if test x"$samba_cv_frsize" = x"yes"; then
+ AC_DEFINE(HAVE_FRSIZE, 1, [Whether statvfs.f_frsize exists])
+fi
+
if test $space = no; then
# DEC Alpha running OSF/1
AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)])
@@ -6115,7 +6130,7 @@ AC_TRY_RUN([#include "${srcdir-.}/tests/summary.c"],
dnl Merge in developer cflags from now on
AC_SUBST(DEVELOPER_CFLAGS)
-if test x"$krb5_developer" = x"yes" -o x"$developer" = x"yes"; then
+if test x"$krb5_developer" = x"yes" -o x"$developer" = x"yes" -o x"$picky_developer" = x"yes"; then
CFLAGS="${CFLAGS} \$(DEVELOPER_CFLAGS)"
fi
diff --git a/source/lib/fsusage.c b/source/lib/fsusage.c
index c5dec5e..66ffb9f 100644
--- a/source/lib/fsusage.c
+++ b/source/lib/fsusage.c
@@ -122,8 +122,13 @@ int sys_fsusage(const char *path, SMB_BIG_UINT *dfree, SMB_BIG_UINT *dsize)
#endif /* STAT_STATFS4 */
#if defined(STAT_STATVFS) || defined(STAT_STATVFS64) /* SVR4 */
+#if defined HAVE_FRSIZE
# define CONVERT_BLOCKS(B) \
adjust_blocks ((SMB_BIG_UINT)(B), fsd.f_frsize ? (SMB_BIG_UINT)fsd.f_frsize : (SMB_BIG_UINT)fsd.f_bsize, (SMB_BIG_UINT)512)
+#else
+# define CONVERT_BLOCKS(B) \
+ adjust_blocks ((SMB_BIG_UINT)(B), (SMB_BIG_UINT)fsd.f_bsize, (SMB_BIG_UINT)512)
+#endif
#ifdef STAT_STATVFS64
struct statvfs64 fsd;
diff --git a/source/lib/iconv.c b/source/lib/iconv.c
index 6575dba..3ceb637 100644
--- a/source/lib/iconv.c
+++ b/source/lib/iconv.c
@@ -136,7 +136,7 @@ static size_t sys_iconv(void *cd,
char **outbuf, size_t *outbytesleft)
{
size_t ret = iconv((iconv_t)cd,
- (char **)inbuf, inbytesleft,
+ (void *)inbuf, inbytesleft,
outbuf, outbytesleft);
if (ret == (size_t)-1) {
int saved_errno = errno;
diff --git a/source/lib/sendfile.c b/source/lib/sendfile.c
index 20b2371..d1b1785 100644
--- a/source/lib/sendfile.c
+++ b/source/lib/sendfile.c
@@ -383,7 +383,8 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
hdtrl.iov_base = NULL;
hdtrl.iov_len = 0;
} else {
- hdtrl.iov_base += nwritten;
+ hdtrl.iov_base =
+ (caddr_t)hdtrl.iov_base + nwritten;
hdtrl.iov_len -= nwritten;
nwritten = 0;
}
diff --git a/source/lib/socket_wrapper/socket_wrapper.c b/source/lib/socket_wrapper/socket_wrapper.c
index 336179d..33e4b38 100644
--- 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/lib/util_sock.c b/source/lib/util_sock.c
index 822ff26..7356b3e 100644
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -43,9 +43,9 @@ bool is_ipaddress_v4(const char *str)
bool is_ipaddress(const char *str)
{
+#if defined(HAVE_IPV6)
int ret = -1;
-#if defined(HAVE_IPV6)
if (strchr_m(str, ':')) {
char addr[INET6_ADDRSTRLEN];
struct in6_addr dest6;
@@ -212,9 +212,9 @@ bool interpret_string_addr(struct sockaddr_storage *pss,
const char *str,
int flags)
{
- char addr[INET6_ADDRSTRLEN];
struct addrinfo *res = NULL;
#if defined(HAVE_IPV6)
+ char addr[INET6_ADDRSTRLEN];
unsigned int scope_id = 0;
if (strchr_m(str, ':')) {
diff --git a/source/librpc/gen_ndr/cli_initshutdown.c b/source/librpc/gen_ndr/cli_initshutdown.c
index d5e5ab6..ab48623 100644
--- 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 4223a35..c7d2cad 100644
--- 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 fe8c4f7..29f7e50 100644
--- 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 8fc7610..793a4ff 100644
--- 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 acfe988..366f017 100644
--- 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 9d857fe..5d6c0c3 100644
--- 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));
--
Samba Shared Repository
More information about the samba-cvs
mailing list