diff options
| author | David Disseldorp <ddiss@samba.org> | 2019-09-08 15:08:54 +0200 |
|---|---|---|
| committer | David Disseldorp <ddiss@samba.org> | 2019-09-09 10:32:53 +0000 |
| commit | 560c3abf453597794e5ddf3782bc05d8ba4e5299 (patch) | |
| tree | c721e105d45b8770ff536010fc1f6b47a5dcfa8a /source3/utils | |
| parent | 3bd68261eca398895c419284db6515fd6f393f0f (diff) | |
| download | samba-560c3abf453597794e5ddf3782bc05d8ba4e5299.tar.gz | |
s3:smbcontrol: avoid printing NULL help strings
Some smbcontrol commands leave the .help pointer NULL, resulting in the
following usage text:
disconnect-dc (null)
notify-cleanup (null)
...
msg-cleanup (null)
Improve this by printing an empty string instead.
Signed-off-by: David Disseldorp <ddiss@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Autobuild-User(master): David Disseldorp <ddiss@samba.org>
Autobuild-Date(master): Mon Sep 9 10:32:53 UTC 2019 on sn-devel-184
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/smbcontrol.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index 739ee93e28b..1435cc57d0a 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -1562,9 +1562,13 @@ static void usage(poptContext pc) fprintf(stderr, "\n"); fprintf(stderr, "<message-type> is one of:\n"); - for (i = 0; msg_types[i].name; i++) - fprintf(stderr, "\t%-30s%s\n", msg_types[i].name, - msg_types[i].help); + for (i = 0; msg_types[i].name; i++) { + const char *help = msg_types[i].help; + if (help == NULL) { + help = ""; + } + fprintf(stderr, "\t%-30s%s\n", msg_types[i].name, help); + } fprintf(stderr, "\n"); |