s3:rpcclient: Fix crash in rpcclient

rpcclient  SERVER -c 'dfsenum 5' dumps core

Signed-off-by: Pavel Filipenský <pfilipen@redhat.com>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Mar  7 00:00:32 UTC 2022 on sn-devel-184

diff --git a/selftest/knownfail.d/rpc-dfs b/selftest/knownfail.d/rpc-dfs
index 28a3b7673dfbc46978031f889e9b9d1822001dae..8ab72ff7b3822869e39517616e3ca9fa61fed4fa 100644 (file)
--- a/selftest/knownfail.d/rpc-dfs
+++ b/selftest/knownfail.d/rpc-dfs
@@ -1,2 +1,2 @@
-^samba3.blackbox.rpcclient_dfs.dfsenum
+#_dfs_EnumEx() is not implemented on RPC server side
 ^samba3.blackbox.rpcclient_dfs.dfsenumex

diff --git a/source3/rpcclient/cmd_dfs.c b/source3/rpcclient/cmd_dfs.c
index e34401d0b22ad69f2e4fa5c5688d36db2705dbfc..8177871dc1790543f55fcc97d5e600a8c13e9463 100644 (file)
--- a/source3/rpcclient/cmd_dfs.c
+++ b/source3/rpcclient/cmd_dfs.c
@@ -222,7 +222,7 @@ static WERROR cmd_dfs_enum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
        case 300: str.e.info300 = &info300; ZERO_STRUCT(info300); break;
        default:
                          printf("Unknown info level %d\n", str.level);
-                         break;
+                         return WERR_OK;
        }
 
        result = dcerpc_dfs_Enum(b, mem_ctx, str.level, 0xFFFFFFFF, &str,
@@ -274,7 +274,7 @@ static WERROR cmd_dfs_enumex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
        case 300: str.e.info300 = &info300; ZERO_STRUCT(info300); break;
        default:
                  printf("Unknown info level %d\n", str.level);
-                 break;
+                 return WERR_OK;
        }
 
        result = dcerpc_dfs_EnumEx(b, mem_ctx, argv[1], str.level,