From: Alexander Bokovoy <ab@samba.org>
Date: Thu, 17 May 2007 13:56:19 +0000 (+0000)
Subject: r22973: Apparently, 3.0.25 broke smb4k badly ;-)
X-Git-Tag: samba-misc-tags/initial-v3-0-unstable~421
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f78b6ce3a635110ba7afe32f3536097d51cb4fc;p=thirdparty%2Fsamba.git

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.
---

diff --git a/source/utils/net_rap.c b/source/utils/net_rap.c
index 9084122d680..54e59673b80 100644
--- a/source/utils/net_rap.c
+++ b/source/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)))