Changeset 51 for trunk/samba/source/ndpsmb/smbwrp.c

Timestamp:

Aug 6, 2007, 1:05:05 AM (18 years ago)

Author:

Paul Smedley

Message:

Fix for share names > 12 characters

File:

• trunk/samba/source/ndpsmb/smbwrp.c (modified) (2 diffs)

trunk/samba/source/ndpsmb/smbwrp.c

@@ -2 +2 @@
 
 #include "smbwrp.h"
+
+//PS
+static int
+net_share_enum_rpc(struct cli_state *cli,
+                   void (*fn)(const char *name,
+                              uint32 type,
+                              const char *comment,
+                              void *state),
+                   void *state)
+{
+        int i;
+        WERROR result;
+        ENUM_HND enum_hnd;
+        uint32 info_level = 1;
+        uint32 preferred_len = 0xffffffff;
+        uint32 type;
+        SRV_SHARE_INFO_CTR ctr;
+        fstring name = "";
+        fstring comment = "";
+        void *mem_ctx;
+        struct rpc_pipe_client *pipe_hnd;
+        NTSTATUS nt_status;
+
+        /* Open the server service pipe */
+        pipe_hnd = cli_rpc_pipe_open_noauth(cli, PI_SRVSVC, &nt_status);
+        if (!pipe_hnd) {
+                DEBUG(1, ("net_share_enum_rpc pipe open fail!\n"));
+                return -1;
+        }
+
+        /* Allocate a context for parsing and for the entries in "ctr" */
+        mem_ctx = talloc_init("libsmbclient: net_share_enum_rpc");
+        if (mem_ctx == NULL) {
+                DEBUG(0, ("out of memory for net_share_enum_rpc!\n"));
+                cli_rpc_pipe_close(pipe_hnd);
+                return -1; 
+        }
+
+        /* Issue the NetShareEnum RPC call and retrieve the response */
+        init_enum_hnd(&enum_hnd, 0);
+        result = rpccli_srvsvc_net_share_enum(pipe_hnd,
+                                              mem_ctx,
+                                              info_level,
+                                              &ctr,
+                                              preferred_len,
+                                              &enum_hnd);
+
+        /* Was it successful? */
+        if (!W_ERROR_IS_OK(result) || ctr.num_entries == 0) {
+                /*  Nope.  Go clean up. */
+                goto done;
+        }
+
+        /* For each returned entry... */
+        for (i = 0; i < ctr.num_entries; i++) {
+
+                /* pull out the share name */
+                rpcstr_pull_unistr2_fstring(
+                        name, &ctr.share.info1[i].info_1_str.uni_netname);
+
+                /* pull out the share's comment */
+                rpcstr_pull_unistr2_fstring(
+                        comment, &ctr.share.info1[i].info_1_str.uni_remark);
+
+                /* Get the type value */
+                type = ctr.share.info1[i].info_1.type;
+
+                /* Add this share to the list */
+                (*fn)(name, type, comment, state);
+        }
+
+done:
+        /* Close the server service pipe */
+        cli_rpc_pipe_close(pipe_hnd);
+
+        /* Free all memory which was allocated for this request */
+        TALLOC_FREE(mem_ctx);
+
+        /* Tell 'em if it worked */
+        return W_ERROR_IS_OK(result) ? 0 : -1;
+}
+//PS
 
 /*
@@ -1306 +1388 @@
                 smbwrp_special_add(".", state);
                 smbwrp_special_add("..", state);
-                if (cli_RNetShareEnum(cli, smbwrp_share_add, state) < 0) 
+//              if (cli_RNetShareEnum(cli, smbwrp_share_add, state) < 0) 
+                if (net_share_enum_rpc(cli, smbwrp_share_add, state) < 0 &&
+                            cli_RNetShareEnum(cli,smbwrp_share_add, state) < 0) 
                 {
                         return os2cli_errno(cli);