Changeset 75

Timestamp:

Sep 28, 2007, 11:19:31 AM (18 years ago)

Author:

Paul Smedley

Message:

return generated path info for workgroups and servers instead of an error code.

Location:

trunk/samba/source/ndpsmb

Files:

• smbcd.c (modified) (2 diffs)
• smbwrp.c (modified) (4 diffs)
• smbwrp.h (modified) (1 diff)

trunk/samba/source/ndpsmb/smbcd.c ¶

@@ -437 +437 @@
                                 break;
                         }
-                        callrc = smbwrp_getattr(cli, (smbwrp_fileinfo *)req->param);
+                        callrc = smbwrp_getattr(srv, cli, (smbwrp_fileinfo *)req->param);
                         res->rc = maperror(callrc);
                 } break;
@@ -542 +542 @@
                                 break;
                         }
-                        callrc = smbwrp_chdir(cli, req->param);
+                        callrc = smbwrp_chdir(srv, cli, req->param);
                         res->rc = maperror(callrc);
                 } break;

trunk/samba/source/ndpsmb/smbwrp.c ¶

@@ -807 +807 @@
 this is needed because win95 sometimes refuses the qpathinfo
 *******************************************************/
-int _System smbwrp_getattr(cli_state * cli, smbwrp_fileinfo *finfo)
+int _System smbwrp_getattr(smbwrp_server *srv, cli_state * cli, smbwrp_fileinfo *finfo)
 {
         SMB_INO_T ino = 0;
@@ -828 +828 @@
 //debuglocal(2,("getattr rc1 %d\n", os2cli_errno(cli)));
 
+        /* If the path is not on a share (it is a workgroup or a server),
+         * then cli_qpathinfo3 obviously fails. Return some fake information
+         * about the directory.
+         */
+        if (   *srv->server_name == 0
+            || (strcmp(cli->dev,"IPC") == 0)
+            || *srv->share_name == 0 
+            || (stricmp(srv->share_name,"IPC$") == 0)
+            || (strncmp(cli->dev,"LPT",3) == 0) 
+           ) 
+        {
+            debuglocal(4,"getattr not a share.\n");
+            *(time_t *)&finfo->ctime = time (NULL);
+            *(time_t *)&finfo->atime = time (NULL);
+            *(time_t *)&finfo->mtime = time (NULL);
+            finfo->size = 0;
+            finfo->easize = 0;
+            finfo->attr = aDIR;
+            return 0;
+        }
+        
         /* if this is NT then don't bother with the getatr */
         if (cli->capabilities & CAP_NT_SMBS && !(cli->capabilities & CAP_NOPATHINFO2)) 
@@ -1431 +1452 @@
 a wrapper for chdir()
 *******************************************************/
-int _System smbwrp_chdir(cli_state * cli, char *fname)
+int _System smbwrp_chdir(smbwrp_server *srv, cli_state * cli, char *fname)
 {
         unsigned short mode = aDIR;
@@ -1441 +1462 @@
 
         strncpy(finfo.fname, fname, sizeof(finfo.fname) - 1);
-        if (smbwrp_getattr(cli, &finfo)) 
+        if (smbwrp_getattr(srv, cli, &finfo)) 
         {
                 return os2cli_errno(cli);

trunk/samba/source/ndpsmb/smbwrp.h ¶

@@ -129 +129 @@
 int _System smbwrp_close(cli_state * cli, smbwrp_file * file);
 int _System smbwrp_setattr(cli_state * cli, smbwrp_fileinfo *finfo);
-int _System smbwrp_getattr(cli_state * cli, smbwrp_fileinfo *finfo);
+int _System smbwrp_getattr(smbwrp_server *srv, cli_state * cli, smbwrp_fileinfo *finfo);
 int _System smbwrp_fgetattr(cli_state * cli, smbwrp_file *file, smbwrp_fileinfo *finfo);
 int _System smbwrp_filelist(smbwrp_server *srv, cli_state * cli, filelist_state * state);
 int _System smbwrp_rename(cli_state * cli, char *oldname, char *newname);
-int _System smbwrp_chdir(cli_state * cli, char *fname);
+int _System smbwrp_chdir(smbwrp_server *srv, cli_state * cli, char *fname);
 int _System smbwrp_mkdir(cli_state * cli, char *fname);
 int _System smbwrp_rmdir(cli_state * cli, char *fname);