Author: ab Date: 2007-05-17 13:56:19 +0000 (Thu, 17 May 2007) New Revision: 22973
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22973 Log: 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. Modified: branches/SAMBA_3_0/source/utils/net_rap.c branches/SAMBA_3_0_25/source/utils/net_rap.c branches/SAMBA_3_0_26/source/utils/net_rap.c Changeset: Modified: branches/SAMBA_3_0/source/utils/net_rap.c =================================================================== --- branches/SAMBA_3_0/source/utils/net_rap.c 2007-05-17 10:33:40 UTC (rev 22972) +++ branches/SAMBA_3_0/source/utils/net_rap.c 2007-05-17 13:56:19 UTC (rev 22973) @@ -435,10 +435,14 @@ 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))) Modified: branches/SAMBA_3_0_25/source/utils/net_rap.c =================================================================== --- branches/SAMBA_3_0_25/source/utils/net_rap.c 2007-05-17 10:33:40 UTC (rev 22972) +++ branches/SAMBA_3_0_25/source/utils/net_rap.c 2007-05-17 13:56:19 UTC (rev 22973) @@ -435,10 +435,14 @@ 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))) Modified: branches/SAMBA_3_0_26/source/utils/net_rap.c =================================================================== --- branches/SAMBA_3_0_26/source/utils/net_rap.c 2007-05-17 10:33:40 UTC (rev 22972) +++ branches/SAMBA_3_0_26/source/utils/net_rap.c 2007-05-17 13:56:19 UTC (rev 22973) @@ -435,10 +435,14 @@ 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)))
