Changeset 105 for branches/samba-3.0/source/smbd/nttrans.c

Timestamp:

Nov 26, 2007, 9:24:27 AM (18 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.27a

File:

• branches/samba-3.0/source/smbd/nttrans.c (modified) (4 diffs)

branches/samba-3.0/source/smbd/nttrans.c

@@ -544 +544 @@
                 pstring rel_fname;
                 files_struct *dir_fsp = file_fsp(inbuf,smb_ntcreate_RootDirectoryFid);
-                size_t dir_name_len;
 
                 if(!dir_fsp) {
@@ -584 +583 @@
 
                 pstrcpy( fname, dir_fsp->fsp_name );
-                dir_name_len = strlen(fname);
-
-                /*
-                 * Ensure it ends in a '\'.
-                 */
-
-                if((fname[dir_name_len-1] != '\\') && (fname[dir_name_len-1] != '/')) {
-                        pstrcat(fname, "/");
-                        dir_name_len++;
+
+                if (ISDOT(fname)) {
+                        fname[0] = '\0';
+                } else {
+                        size_t dir_name_len = strlen(fname);
+                        /*
+                         * Ensure it ends in a '\'.
+                         */
+
+                        if((fname[dir_name_len-1] != '\\') && (fname[dir_name_len-1] != '/')) {
+                                pstrcat(fname, "/");
+                        }
                 }
 
@@ -1245 +1247 @@
                  */
                 files_struct *dir_fsp = file_fsp(params,4);
-                size_t dir_name_len;
 
                 if(!dir_fsp) {
@@ -1273 +1274 @@
 
                 pstrcpy( fname, dir_fsp->fsp_name );
-                dir_name_len = strlen(fname);
-
-                /*
-                 * Ensure it ends in a '\'.
-                 */
-
-                if((fname[dir_name_len-1] != '\\') && (fname[dir_name_len-1] != '/')) {
-                        pstrcat(fname, "/");
-                        dir_name_len++;
+
+                if (ISDOT(fname)) {
+                        fname[0] = '\0';
+                } else {
+                        size_t dir_name_len = strlen(fname);
+                        /*
+                         * Ensure it ends in a '\'.
+                         */
+
+                        if((fname[dir_name_len-1] != '\\') && (fname[dir_name_len-1] != '/')) {
+                                pstrcat(fname, "/");
+                        }
                 }