diff options
| author | Alexander Bokovoy <ab@samba.org> | 2007-05-17 13:56:19 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:22:12 -0500 |
| commit | 5d26d56e0f228eec9ba32a06510fb93054b393c5 (patch) | |
| tree | fa01121222b9bbee8e6423ee592bef1c04f922ae | |
| parent | 0b38bfa9ea337f360fca6a85eb9764d1eafb1728 (diff) | |
| download | samba-5d26d56e0f228eec9ba32a06510fb93054b393c5.tar.gz samba-5d26d56e0f228eec9ba32a06510fb93054b393c5.tar.bz2 samba-5d26d56e0f228eec9ba32a06510fb93054b393c5.zip | |
r22973: Apparently, 3.0.25 broke smb4k badly ;-)
smb4k uses 'net rap server domain' to list servers in domain.
Previously we just ignored all arguments in net_rap_server() but now we don't
as 'net rap server name' has added an explicit check on arguments.
Allow 'net rap server domain' to aid smb4k. Any other arguments will cause help message.
(This used to be commit 8f78b6ce3a635110ba7afe32f3536097d51cb4fc)
| -rw-r--r-- | source3/utils/net_rap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source3/utils/net_rap.c b/source3/utils/net_rap.c index 9084122d68..54e59673b8 100644 --- a/source3/utils/net_rap.c +++ b/source3/utils/net_rap.c @@ -435,10 +435,14 @@ int net_rap_server(int argc, const char **argv) int ret; if (argc > 0) { - if (!strequal(argv[0], "name")) { + if (strequal(argv[0], "name")) { + return net_rap_server_name(argc, argv); + } + /* smb4k uses 'net [rap|rpc] server domain' to query servers in a domain */ + /* Fall through for 'domain', any other forms will cause to show usage message */ + if (!strequal(argv[0], "domain")) { return net_rap_server_usage(argc-1, argv+1); } - return net_rap_server_name(argc, argv); } if (!(cli = net_make_ipc_connection(0))) |