Some crash fixes for netshareenum returning zero shares.

diff --git a/source/libsmb/cli_srvsvc.c b/source/libsmb/cli_srvsvc.c
index b92b356241c1b8c99e9ce12f2a367b362d336384..1bdd19620b4c4eb57d334c35236865982d9f19a4 100644 (file)
--- a/source/libsmb/cli_srvsvc.c
+++ b/source/libsmb/cli_srvsvc.c
@@ -116,6 +116,9 @@ WERROR cli_srvsvc_net_share_enum(struct cli_state *cli, TALLOC_CTX *mem_ctx,
 
        ZERO_STRUCTP(ctr);
 
+       if (!r.ctr.num_entries)
+               goto done;
+
        ctr->info_level = info_level;
        ctr->num_entries = r.ctr.num_entries;
 

diff --git a/source/rpcclient/cmd_srvsvc.c b/source/rpcclient/cmd_srvsvc.c
index 43bfb250489359c8ef9b1e22cd225c494044c9e4..8d416f8db017ea6b1105b1fbe746813f57779313 100644 (file)
--- a/source/rpcclient/cmd_srvsvc.c
+++ b/source/rpcclient/cmd_srvsvc.c
@@ -270,7 +270,7 @@ static NTSTATUS cmd_srvsvc_net_share_enum(struct cli_state *cli,
        result = cli_srvsvc_net_share_enum(
                cli, mem_ctx, info_level, &ctr, preferred_len, &hnd);
 
-       if (!W_ERROR_IS_OK(result))
+       if (!W_ERROR_IS_OK(result) || !ctr.num_entries)
                goto done;
 
        /* Display results */