Changeset 297 for branches/client-1.6/src

Timestamp:

Jul 2, 2009, 2:07:00 PM (16 years ago)

Author:

Silvan Scherrer

Message:

first drop, still some problems

Location:

branches/client-1.6/src

Files:

• Makefile.kmk (modified) (1 diff)
• smbwrp.c (modified) (33 diffs)

branches/client-1.6/src/Makefile.kmk

@@ -45 +45 @@
                 $(SAMBA)/source/popt \
                 $(SAMBA)/source/lib/talloc \
-                $(SAMBA)/source/lib/pc \
+                $(SAMBA)/source/librpc \
                 $(SAMBA)/source/lib/tdb/include \
-        $(SAMBA)/source/lib/tdb/common \
-        $(SAMBA)/source/lib/compression \
-        $(SAMBA)/source/lib/ldb/include \
-        $(SAMBA)/source/lib/ldb/ldb_tdb \
-        $(SAMBA)/source/lib/ldb/modules \
-        $(SAMBA)/source/lib/ldb/nssldb \
-        $(SAMBA)/source/lib/ldb/tools \
-        $(SAMBA)/source/lib/netapi \
-        $(SAMBA)/source/lib/nss_wrapper \
-        $(SAMBA)/source/lib/smbconf \
-        $(SAMBA)/source/lib/socket_wrapper \
                 $(GCC_INC)
 

branches/client-1.6/src/smbwrp.c

@@ -33 +33 @@
 {
         int i;
-        WERROR result;
-        ENUM_HND enum_hnd;
-        uint32 info_level = 1;
-        uint32 preferred_len = 0xffffffff;
-        uint32 type;
-        SRV_SHARE_INFO_CTR ctr;
+        NTSTATUS status;
+        WERROR werr;
+        uint32_t resume_handle = 0;
+        uint32_t total_entries = 0;
+        struct srvsvc_NetShareInfoCtr info_ctr;
+        struct srvsvc_NetShareCtr1 ctr1;
         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) {
+        status = cli_rpc_pipe_open_noauth(cli, &ndr_table_srvsvc.syntax_id, &pipe_hnd);
+        if (!NT_STATUS_IS_OK(status)) {
                 DEBUG(1, ("net_share_enum_rpc pipe open fail!\n"));
                 return -1;
@@ -56 +55 @@
         if (mem_ctx == NULL) {
                 DEBUG(0, ("out of memory for net_share_enum_rpc!\n"));
-                cli_rpc_pipe_close(pipe_hnd);
+                TALLOC_FREE(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);
+        ZERO_STRUCT(info_ctr);
+        ZERO_STRUCT(ctr1);
+        info_ctr.level = 1;
+        info_ctr.ctr.ctr1 = &ctr1;
+        status = rpccli_srvsvc_NetShareEnumAll(pipe_hnd, mem_ctx,
+                                              pipe_hnd->desthost,
+                                              &info_ctr,
+                                              0xffffffff,
+                                              &total_entries,
+                                              &resume_handle, 
+                                              &werr);
 
         /* Was it successful? */
-        if (!W_ERROR_IS_OK(result) || ctr.num_entries == 0) {
+        if (!NT_STATUS_IS_OK(status) || !W_ERROR_IS_OK(werr) || info_ctr.ctr.ctr1->count == 0) {
                 /*  Nope.  Go clean up. */
                 goto done;
@@ -76 +79 @@
 
         /* 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;
+        for (i = 0; i < info_ctr.ctr.ctr1->count; i++) {
+                struct srvsvc_NetShareInfo1 info = info_ctr.ctr.ctr1->array[i];
 
                 /* Add this share to the list */
-                (*fn)(name, type, comment, state);
+                (*fn)(info.name, info.type, info.comment, state);
         }
 
 done:
         /* Close the server service pipe */
-        cli_rpc_pipe_close(pipe_hnd);
+        TALLOC_FREE(pipe_hnd);
 
         /* Free all memory which was allocated for this request */
@@ -101 +94 @@
 
         /* Tell 'em if it worked */
-        return W_ERROR_IS_OK(result) ? 0 : -1;
+        return W_ERROR_IS_OK(status) ? 0 : -1;
 }
 
@@ -129 +122 @@
         static int initialised = 0;
         char *p;
-        pstring line;
 
         if (initialised) 
@@ -137 +129 @@
         initialised = 1;
 
+        lp_set_in_client(true); /* Make sure that we tell lp_load we are client */
+
         load_case_tables();
 
-        init_globals( True);
+        if (!lp_load(get_dyn_CONFIGFILE(),true,false,false,true)) {
+                debuglocal(0,("The initial smb.conf is missing, please reinstall the plugin!"));
+        }
+
 
         load_interfaces();
@@ -254 +251 @@
 send a qpathinfo call with the SMB_QUERY_FILE_ALL_INFO info level
 ****************************************************************************/
-BOOL cli_qpathinfo3(struct cli_state *cli, const char *fname, 
+bool cli_qpathinfo3(struct cli_state *cli, const char *fname, 
                     time_t *c_time, time_t *a_time, time_t *m_time, 
                     time_t *w_time, off_t *size, uint16 *mode,
@@ -262 +259 @@
         unsigned int param_len = 0;
         uint16 setup = TRANSACT2_QPATHINFO;
-        pstring param;
+        char *param;
+        size_t nlen = 2*(strlen(fname)+1);
         char *rparam=NULL, *rdata=NULL;
         char *p;
+        
+        param = SMB_MALLOC_ARRAY(char, 6+nlen+2);
+        if (!param) {
+                return false;
+        }
 
         p = param;
-        memset(p, 0, 6);
+        memset(p, '\0', 6);
         SSVAL(p, 0, SMB_QUERY_FILE_ALL_INFO);
         p += 6;
-        p += clistr_push(cli, p, fname, sizeof(pstring)-6, STR_TERMINATE);
+        p += clistr_push(cli, p, fname, nlen, STR_TERMINATE);
 
         param_len = PTR_DIFF(p, param);
@@ -284 +287 @@
         }
 
+        SAFE_FREE(param);
         if (!cli_receive_trans(cli, SMBtrans2,
                                &rparam, &param_len,
@@ -324 +328 @@
 send a qfileinfo call
 ****************************************************************************/
-BOOL cli_qfileinfo3(struct cli_state *cli, int fnum, 
+bool cli_qfileinfo3(struct cli_state *cli, int fnum, 
                    uint16 *mode, off_t *size,
                    time_t *c_time, time_t *a_time, time_t *m_time, 
@@ -332 +336 @@
         unsigned int param_len = 0;
         uint16 setup = TRANSACT2_QFILEINFO;
-        pstring param;
+        char param[4];
         char *rparam=NULL, *rdata=NULL;
 
@@ -341 +345 @@
         param_len = 4;
 
-        memset(param, 0, param_len);
         SSVAL(param, 0, fnum);
         SSVAL(param, 2, SMB_QUERY_FILE_ALL_INFO);
@@ -404 +407 @@
         char *p, *server_n = server;
         fstring group;
-        struct in_addr ip;
+        struct sockaddr_storage ss;
         NTSTATUS rc;
         struct cli_state * c;
@@ -410 +413 @@
         int loginerror = 0;
 
-        zero_ip(&ip);
+        zero_sockaddr(&ss);
 
         debuglocal(1,"Connecting to \\\\%s:*********@%s:%s\\%s. Master %s:%d\n", srv->username,  workgroup, server, share, srv->master, srv->ifmastergroup);
 
         if (!*server) {
-                struct in_addr sip;
+                struct sockaddr_storage sip;
 
                 if (*workgroup)
@@ -422 +425 @@
                                 return 1;
                         }
-                        fstrcpy(group, inet_ntoa(sip));
+                        fstrcpy(group, inet_ntoa(sip.sin_addr));
                         server_n = group;
                 } else
@@ -432 +435 @@
                                         return 11;
                                 }
-                                strncpy(srv->master, inet_ntoa(sip), sizeof(srv->master) - 1);
+                                strncpy(srv->master, inet_ntoa(sip.sin_addr), sizeof(srv->master) - 1);
                                 srv->ifmastergroup = 0;
                         }
@@ -447 +450 @@
 
  again:
-        zero_ip(&ip);
+        zero_sockaddr(&ss);
 
         /* have to open a new connection */
@@ -455 +458 @@
         }
 
-        if (!NT_STATUS_IS_OK(cli_connect(c, server_n, &ip))) 
+        if (!NT_STATUS_IS_OK(cli_connect(c, server_n, &ss))) 
         {
                 return 3;
@@ -666 +669 @@
         unsigned int param_len = 6;
         uint16 setup = TRANSACT2_SETFILEINFO;
-        pstring param;
+        char param[6];
+        unsigned char data[8];
         char *rparam=NULL, *rdata=NULL;
 
-        memset(param, 0, param_len);
         SSVAL(param,0,fnum);
         SSVAL(param,2,SMB_SET_FILE_END_OF_FILE_INFO);
+        SSVAL(param,4,0);
+
+        SBVAL(data, 0, newsize);
 
         if (!cli_send_trans(cli, SMBtrans2,
@@ -678 +684 @@
                                                 &setup, 1, 0,                   /* setup, length, max */
                                                 param, param_len, 2,            /* param, length, max */
-                                                (char *)&newsize,  sizeof(newsize), cli->max_xmit /* data, length, max */
+                                                (char *)&data,  data_len,        /* data, length */
+                                                cli->max_xmit /* max */
                                                 )) {
                 return False;
@@ -1033 +1040 @@
 ****************************************************************************/
 // YD from libsmb\clilist.c
+// @todo def_finfo is not available anymore, probably the complete function needs more work
+// in the longrun we have to switch to file_info struct instead of our own smbwrp_fileinfo
+
 static size_t _os2_interpret_long_filename(struct cli_state *cli,
                                    int level,char *p, smbwrp_fileinfo *finfo,
@@ -1178 +1188 @@
 #endif
         int info_level;
-        char *p, *p2;
-        pstring mask;
+        char *p, *p2, *rdata_end;
+        char *mask=NULL;
         smbwrp_fileinfo finfo;
         int i;
@@ -1185 +1195 @@
         int dirlist_len = 0;
         int total_received = -1;
-        BOOL First = True;
+        bool First = True;
         int ff_searchcount=0;
         int ff_eos=0;
@@ -1193 +1203 @@
         unsigned int param_len, data_len;       
         uint16 setup;
-        pstring param;
+        char *param;
         const char *mnt;
         uint32 resume_key = 0;
         uint32 last_name_raw_len = 0;
-        DATA_BLOB last_name_raw = data_blob(NULL, 2*sizeof(pstring));
+        DATA_BLOB last_name_raw = data_blob(NULL, 0);
 
         /* NT uses 260, OS/2 uses 2. Both accept 1. */
         info_level = (cli->capabilities&CAP_NT_SMBS)?260:2; 
-
-        debuglocal(4,"list_files level %d. mask <%s>\n", info_level, mask);
+        
+        debuglocal(4,"list_files level %d. mask <%s>\n", info_level, Mask);
 
         /* when getting a directory listing from a 2k dfs root share, 
            we have to include the full path (\server\share\mask) here */
            
-        if ( cli->dfsroot )
-                pstr_sprintf( mask, "\\%s\\%s\\%s", cli->desthost, cli->share, Mask );
-        else
-                pstrcpy(mask,Mask);
+        if ( cli->dfsroot ) {
+                mask = talloc_asprintf(mask, "\\%s\\%s\\%s", cli->desthost, cli->share, Mask );
+        } else {
+                mask = SMB_STRDUP(Mask);
+                if (!mask) {
+                      return -1;
+                }
+        }
 
         while (ff_eos == 0) {
@@ -1216 +1230 @@
                 if (loop_count > 200) {
                         debuglocal(0,"Error: Looping in FIND_NEXT??\n");
+                        break;
+                }
+
+                size_t nlen = 2*(strlen(mask)+1);
+                param = SMB_MALLOC_ARRAY(char, 12+nlen+last_name_raw.length+2);
+                if (!param) {
                         break;
                 }
@@ -1227 +1247 @@
                         SIVAL(param,8,0);
                         p = param+12;
-                        p += clistr_push(cli, param+12, mask, sizeof(param)-12, 
+                        p += clistr_push(cli, param+12, mask, nlen, 
                                          STR_TERMINATE);
                 } else {
@@ -1241 +1261 @@
                         SSVAL(param,10,(FLAG_TRANS2_FIND_REQUIRE_RESUME|FLAG_TRANS2_FIND_CLOSE_IF_END));        /* resume required + close on end */
                         p = param+12;
-                        if (last_name_raw_len && (last_name_raw_len < (sizeof(param)-12))) {
-                                memcpy(p, last_name_raw.data, last_name_raw_len);
-                                p += last_name_raw_len;
+                        if (last_name_raw.length) {
+                                memcpy(p, last_name_raw.data, last_name_raw.length);
+                                p += last_name_raw.length;
                         } else {
-                                p += clistr_push(cli, param+12, mask, sizeof(param)-12, STR_TERMINATE);
+                                p += clistr_push(cli, param+12, mask, nlen, STR_TERMINATE);
                         }
                 }
@@ -1264 +1284 @@
 #endif
                                     )) {
+                        SAFE_FREE(param);
                         break;
                 }
+
+                SAFE_FREE(param);
 
                 if (!cli_receive_trans(cli, SMBtrans2, 
@@ -1337 +1360 @@
                 /* point to the data bytes */
                 p = rdata;
-
-                memset(&finfo, 0, sizeof(finfo));
+                rdata_end = rdata + data_len;
+
+                memset(&finfo, 0, sizeof(finfo));
                 finfo.easize = -1;
                 /* we might need the lastname for continuations */
-                for (p2=p,i=0;i<ff_searchcount;i++) {
+                for (p2=p,i=0;i<ff_searchcount  && p2 < rdata_end;i++) {
                         if ((info_level == 260) && (i == ff_searchcount-1)) {
                                 /* Last entry - fixup the last offset length. */
@@ -1347 +1371 @@
                         }
                         p2 += _os2_interpret_long_filename(cli,info_level,p2,&finfo,
-                                                        &resume_key,&last_name_raw,&last_name_raw_len);
+                                                        &resume_key,&last_name_raw,&last_name_raw.length);
+
+                        if (!finfo.fname) {
+                                debuglocal(0,("Error: unable to parse name from info level %d\n",
+                                        info_level));
+                                ff_eos = 1;
+                                break;
+                        }
 
                         if (!First && *mask && strcsequal(finfo.fname, mask)) {
@@ -1357 +1388 @@
                 }
 
+                SAFE_FREE(mask);
                 if (ff_searchcount > 0) {
-                        pstrcpy(mask, finfo.fname);
+                        mask = SMB_STRDUP(finfo.fname);
                 } else {
-                        pstrcpy(mask,"");
+                        mask = SMB_STRDUP("");
+                }
+                if (!mask) {
+                        SAFE_FREE(rdata);
+                        SAFE_FREE(rparam);
+                        break;
                 }
 
@@ -1407 +1444 @@
         /* free up the dirlist buffer and last name raw blob */
         SAFE_FREE(dirlist);
+        SAFE_FREE(mask);
         data_blob_free(&last_name_raw);
         return(total_received);
@@ -1721 +1759 @@
         return 0;
 }
-