Changeset 528 for trunk/client/src

Timestamp:

Jan 24, 2011, 12:04:13 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Client 2.1: more errno fixes

Location:

trunk/client/src

Files:

• Config.km_ (modified) (1 diff)
• ndpsmb.c (modified) (1 diff)
• smbwrp.c (modified) (5 diffs)

trunk/client/src/Config.km_

@@ -10 +10 @@
 # adjust also the date please
 #
-VERSION = 1.6.0
+VERSION = 2.1.x
 BUILD   = beta-date
 SAMBA   = ../../samba-33

trunk/client/src/ndpsmb.c

@@ -966 +966 @@
                                 }
                         }
-                        else
-                        {
+                        
+                        if (rc == NO_ERROR)                     {
                                 finfo.easize = -1;
                                 getfindinfoL(pConn, plist, &finfo, 0, NULL);
                         }
-                        if (rc == ERROR_FILE_NOT_FOUND)
+                        else if (rc == ERROR_FILE_NOT_FOUND)
                         {
                                 // now try the upper path
-                                char * p = ph->fsphStrChr(finfo.fname, '\\');
+                                char * p = ph->fsphStrRChr(finfo.fname, '\\');
                                 if (p && p > finfo.fname)
                                 {
                                         *p = 0;
                                         rc = smbwrp_getattr( &pRes->srv, pConn->cli, &finfo);
-                                        if (rc)
+                                        debuglocal(9,"NdpQueryPathInfo upper path in <%s>, rc = %d\n",  finfo.fname, rc);
+                                        if (rc == NO_ERROR)
                                         {       
-                                            debuglocal(9,"NdpQueryPathInfo upper path in <%s>, retry = %d\n",  finfo.fname, retry);
-                                            rc = rc ? ERROR_PATH_NOT_FOUND : ERROR_INVALID_PARAMETER;
+                                            rc = (finfo.attr & FILE_DIRECTORY) !=0 ?
+                                                ERROR_PATH_NOT_FOUND :
+                                                ERROR_INVALID_PARAMETER;
+                                        }
+                                        else if (rc != ERROR_REM_NOT_LIST)
+                                        {
+                                              rc = ERROR_PATH_NOT_FOUND;
                                         }
                                 }

trunk/client/src/smbwrp.c

@@ -174 +174 @@
 
         if (!lp_load(get_dyn_CONFIGFILE(),true,false,false,true)) {
-                debuglocal(0,("The initial smb.conf is missing, please reinstall the plugin!"));
-        }
-
+                debuglocal(0,("The initial smb.conf is missing, defaults are used!\n"));
+        }
 
         load_interfaces();
@@ -959 +958 @@
         if (cli->capabilities & CAP_NT_SMBS && !(cli->capabilities & CAP_NOPATHINFO2)) 
         {
-                int rc = os2cli_errno(cli);
+                int ret = cli_errno(cli);
                 // cli_qpathinfo* reports EINVAL when path of given file not exists
                 // thus there is no real situation when EINVAL should be returned to 
                 // client at this point, we just replace it to ENOTDIR
-                if (rc == EINVAL)
-                {
-                        rc = maperror(ENOTDIR);
-                }
-                return rc;
+                if (ret == EINVAL)
+                {
+                        ret = ENOTDIR;
+                }
+                return maperror(ret);
         }
 
@@ -1031 +1030 @@
         {
                 filelist_state * st  = (filelist_state *)state;
-                char fullname[ _MAX_PATH];
+                char fullname[ _MAX_PATH] = {0};
                 debuglocal(8,"adding <%s> %d %d %d\n", finfo->fname, sizeof(st->finfo), st->datalen, sizeof(st->finfo.fname));
                 memcpy(&st->finfo, finfo, sizeof(st->finfo));
@@ -1099 +1098 @@
 ****************************************************************************/
 // YD from libsmb\clilist.c
-// @todo who frees fname, as clistr_pull_talloc allocs it
 static size_t _os2_interpret_long_filename(TALLOC_CTX *ctx, struct cli_state *cli,
                                    int level,const char *p, const char *pdata_end, smbwrp_fileinfo *finfo,
@@ -1249 +1247 @@
                         }
                         strncpy(finfo->fname, fname, sizeof(finfo->fname) -1);
+
                         /* To be robust in the face of unicode conversion failures
                            we need to copy the raw bytes of the last name seen here.