diff options
Diffstat (limited to 'source/utils')
| -rw-r--r-- | source/utils/net_rpc.c | 5 | ||||
| -rw-r--r-- | source/utils/status.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/source/utils/net_rpc.c b/source/utils/net_rpc.c index 50114d5fac6..ac7e5663441 100644 --- a/source/utils/net_rpc.c +++ b/source/utils/net_rpc.c @@ -4469,7 +4469,10 @@ static NTSTATUS rpc_init_shutdown_internals(const DOM_SID *domain_sid, if (opt_comment) { msg = opt_comment; + } else { + msg = ""; } + if (opt_timeout) { timeout = opt_timeout; } @@ -5965,7 +5968,7 @@ int net_rpc_usage(int argc, const char **argv) d_printf("\t-r or --reboot\trequest remote server reboot on shutdown\n"); d_printf("\t-f or --force\trequest the remote server force its shutdown\n"); d_printf("\t-t or --timeout=<timeout>\tnumber of seconds before shutdown\n"); - d_printf("\t-c or --comment=<message>\ttext message to display on impending shutdown\n"); + d_printf("\t-C or --comment=<message>\ttext message to display on impending shutdown\n"); return -1; } diff --git a/source/utils/status.c b/source/utils/status.c index bed9828c228..96e4bd266b9 100644 --- a/source/utils/status.c +++ b/source/utils/status.c @@ -128,7 +128,8 @@ static void print_share_mode(share_mode_entry *e, char *fname) } } d_printf("0x%-8x ",(unsigned int)e->access_mask); - if (e->access_mask & (FILE_READ_DATA|FILE_WRITE_DATA)) { + if ((e->access_mask & (FILE_READ_DATA|FILE_WRITE_DATA))== + (FILE_READ_DATA|FILE_WRITE_DATA)) { d_printf("RDWR "); } else if (e->access_mask & FILE_WRITE_DATA) { d_printf("WRONLY "); |