Changeset 627 for trunk/client/src/smbwrp.c

Timestamp:

Aug 24, 2011, 7:31:18 PM (14 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.2: made it build

File:

• trunk/client/src/smbwrp.c (modified) (22 diffs)

trunk/client/src/smbwrp.c

@@ -147 +147 @@
 const char * smbwrp_getVersion()
 {
-        return SAMBA_VERSION_STRING;
+        return samba_version_string();
 }
 
@@ -566 +566 @@
             dev_type = "A:";
 
-        if (!cli_send_tconX(c, share, dev_type,
-                            srv->password, strlen(srv->password)+1)) {
+        if (!NT_STATUS_IS_OK(cli_tcon_andx(c, share, dev_type,
+                            srv->password, strlen(srv->password)+1))) {
                 cli_shutdown(c);
                 // if loginerror is != 0 means normal login failed, but anonymous login worked
@@ -603 +603 @@
 int _System smbwrp_open(cli_state * cli, smbwrp_file * file)
 {
-        int fd = -1;
+        uint16_t fd = 0;
 
         if (!cli || !file || !*file->fname) 
@@ -615 +615 @@
 
         debuglocal(4,"cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
-        file->fd = cli_open(cli, file->fname, file->openmode, file->denymode);
-        if (file->fd == -1)
+        if (!NT_STATUS_IS_OK(cli_open(cli, file->fname, file->openmode, file->denymode, &fd)))
         {       
                 return os2cli_errno(cli);
         }
+        file->fd = fd;
         if (file->openmode & (O_WRONLY | O_RDWR | O_TRUNC | O_CREAT))
         {
@@ -780 +780 @@
                         return os2cli_errno(cli);
                 }
+                uint16_t fd = 0;
                 file->fd = -1;
                 file->offset = 0;                       
@@ -785 +786 @@
                 file->openmode |= O_TRUNC;
                 debuglocal(4,"cli_setnewfileszie : cli_open(%s) attr %08x mode %02x denymode %02x\n", file->fname, file->openattr, file->openmode, file->denymode);
-                file->fd = cli_open(cli, file->fname, file->openmode, file->denymode);
-                if (file->fd == -1)
+                if (!NT_STATUS_IS_OK(cli_open(cli, file->fname, file->openmode, file->denymode, &fd)))
                 {       
                         return os2cli_errno(cli);
                 }
+                file->fd = fd;
         }       
         return 0;
@@ -859 +860 @@
         } else 
 #endif
-        if (!cli_unlink(cli, fname)) 
+        if (!NT_STATUS_IS_OK(cli_unlink(cli, fname, aSYSTEM | aHIDDEN))) 
         {
                 return os2cli_errno(cli);
@@ -899 +900 @@
                                    NULL, NULL) &&
                     !cli_getattrE(cli, file->fd, 
-                                  NULL, (SMB_BIG_UINT *)&size, NULL, NULL, NULL)) 
+                                  NULL, &size, NULL, NULL, NULL)) 
                 {
                         return os2cli_errno(cli);
@@ -1007 +1008 @@
         {
                 if (!cli_getattrE(cli, file->fd, 
-                          (unsigned short *)&finfo->attr, (SMB_BIG_UINT *)(&finfo->size), (time_t *)&finfo->ctime, (time_t *)&finfo->atime, (time_t *)&finfo->mtime)) 
+                          (unsigned short *)&finfo->attr, (&finfo->size), (time_t *)&finfo->ctime, (time_t *)&finfo->atime, (time_t *)&finfo->mtime)) 
                 {
                         return os2cli_errno(cli);
@@ -1128 +1129 @@
         
         switch (level) {
-                case 1: /* OS/2 understands this */
+                case SMB_FIND_INFO_STANDARD: /* OS/2 understands this */
                         /* these dates are converted to GMT by
                            make_unix_date */
@@ -1161 +1162 @@
                            between win2000 and win9x for this call
                            (tridge) */
-                        ret = clistr_pull_talloc(ctx, cli, &fname, p,
+                        ret = clistr_pull_talloc(ctx, cli->inbuf, &fname, p,
                                          len+2,
                                          STR_TERMINATE);
@@ -1172 +1173 @@
                         return PTR_DIFF(p, base);
 
-                case 2: /* this is what OS/2 uses mostly */
+                case SMB_FIND_EA_SIZE: /* this is what OS/2 uses mostly */
                         /* these dates are converted to GMT by
                            make_unix_date */
@@ -1190 +1191 @@
                                 return pdata_end - base;
                         }
-                        ret = clistr_pull_talloc(ctx, cli, &fname, p,
+                        ret = clistr_pull_talloc(ctx, cli->inbuf, &fname, p,
                                          len, 
                                          STR_NOALIGN);
@@ -1200 +1201 @@
                         return PTR_DIFF(p, base) + 1;
                         
-                case 260: /* NT uses this, but also accepts 2 */
+                case SMB_FIND_FILE_BOTH_DIRECTORY_INFO: /* NT uses this, but also accepts 2 */
                 {
                         size_t namelen, slen;
@@ -1253 +1254 @@
                                 return pdata_end - base;
                         }         
-                        ret = clistr_pull_talloc(ctx, cli, &fname, p,
+                        ret = clistr_pull_talloc(ctx, cli->inbuf, &fname, p,
                                     namelen, 0);
                         if (ret == (size_t)-1) {
@@ -1309 +1310 @@
         uint16 setup;
         char *param;
-        const char *mnt;
         uint32 resume_key = 0;
         TALLOC_CTX *frame = talloc_stackframe();
         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; 
+        /* NT uses SMB_FIND_FILE_BOTH_DIRECTORY_INFO,
+         OS/2 uses SMB_FIND_EA_SIZE. Both accept SMB_FIND_INFO_STANDARD. */
+        info_level = (cli->capabilities&CAP_NT_SMBS)?
+           SMB_FIND_FILE_BOTH_DIRECTORY_INFO : SMB_FIND_EA_SIZE; 
         
         debuglocal(4,"list_files level %d. mask <%s>\n", info_level, Mask);
@@ -1372 +1374 @@
                                 p += last_name_raw.length;
                         } else {
-                                p += clistr_push(cli, param+12, mask, nlen, STR_TERMINATE);
+                                p += clistr_push(cli, param+12, mask,
+                                              nlen, STR_TERMINATE);
                         }
                 }
@@ -1433 +1436 @@
                 if (cli_is_error(cli) || !rdata || !rparam) 
                 {
-                        if (First && info_level == 2)
+                        if (First && info_level == SMB_FIND_EA_SIZE)
                         {
                                 // we have tried query ea size, but now will try without ea size
-                                info_level = 1;
+                                info_level = SMB_FIND_INFO_STANDARD;
                                 debuglocal(4,"list_files fallback to level %d\n", info_level);
                                 continue;
@@ -1474 +1477 @@
                 /* we might need the lastname for continuations */
                 for (p2=p,i=0;i<ff_searchcount  && p2 < rdata_end;i++) {
-                        if ((info_level == 260) && (i == ff_searchcount-1)) {
+                        if ((info_level == SMB_FIND_FILE_BOTH_DIRECTORY_INFO) && 
+                                        (i == ff_searchcount-1)) {
                                 /* Last entry - fixup the last offset length. */
                                 SIVAL(p2,0,PTR_DIFF((rdata + data_len),p2));
@@ -1497 +1501 @@
 
                 SAFE_FREE(mask);
-                if (ff_searchcount > 0) {
+                if (ff_searchcount > 0 && ff_eos == 0 && finfo.fname) {
                         mask = SMB_STRDUP(finfo.fname);
                 } else {
@@ -1536 +1540 @@
         }
 
-        mnt = cli_cm_get_mntpoint( cli );
-
         /* see if the server disconnected or the connection otherwise failed */
         if (cli_is_error(cli)) {
@@ -1555 +1557 @@
                                 break;
                         }
-                        fn( mnt,&finfo, Mask, state );
+                        fn(cli->dfs_mountpoint,&finfo, Mask, state );
 
                         /* Also add the entry to the cache. */