summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2003-01-04 14:00:17 +0000
committerAndrew Bartlett <abartlet@samba.org>2003-01-04 14:00:17 +0000
commit4eb59f56f17b309f4bd6284c3d3c9550a67060bc (patch)
treeaaf87e1766d9d5a3948444091ff62f2da9c8d998 /source3
parentaff13f53afe54506cdb679b355c7f9a3505c8736 (diff)
downloadsamba-4eb59f56f17b309f4bd6284c3d3c9550a67060bc.tar.gz
samba-4eb59f56f17b309f4bd6284c3d3c9550a67060bc.tar.bz2
samba-4eb59f56f17b309f4bd6284c3d3c9550a67060bc.zip
The last of the merge of idra's shutdown changes from head...
Andrew Bartlett (This used to be commit 3b24da8f9971e73b9cb4396e6a18c0694d279aa3)
Diffstat (limited to 'source3')
-rw-r--r--source3/rpc_server/srv_reg_nt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/rpc_server/srv_reg_nt.c b/source3/rpc_server/srv_reg_nt.c
index c9158a9cf9..cbf237251e 100644
--- a/source3/rpc_server/srv_reg_nt.c
+++ b/source3/rpc_server/srv_reg_nt.c
@@ -590,9 +590,9 @@ NTSTATUS _reg_shutdown(pipes_struct *p, REG_Q_SHUTDOWN *q_u, REG_R_SHUTDOWN *r_u
/* timeout */
snprintf(timeout, sizeof(timeout), "%d", q_u->timeout);
/* reboot */
- snprintf(r, sizeof(r), (q_u->flags & REG_REBOOT_ON_SHUTDOWN)?SHUTDOWN_R_STRING:"");
+ snprintf(r, sizeof(r), (q_u->reboot) ? SHUTDOWN_R_STRING : "");
/* force */
- snprintf(f, sizeof(f), (q_u->flags & REG_FORCE_SHUTDOWN)?SHUTDOWN_F_STRING:"");
+ snprintf(f, sizeof(f), (q_u->force) ? SHUTDOWN_F_STRING : "");
pstrcpy(shutdown_script, lp_shutdown_script());