Changeset 221 for branches/samba-3.3.x/source/client

Timestamp:

May 24, 2009, 7:17:10 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 to 3.3.1

Location:

branches/samba-3.3.x/source/client

Files:

• client.c (modified) (1 diff)
• mount.cifs.c (modified) (6 diffs)
• umount.cifs.c (modified) (3 diffs)

branches/samba-3.3.x/source/client/client.c

@@ -1786 +1786 @@
 ****************************************************************************/
 
-static void free_file_list (struct file_list *list_head)
+static void free_file_list (struct file_list *l_head)
 {
         struct file_list *list, *next;
 
-        for (list = list_head; list; list = next) {
+        for (list = l_head; list; list = next) {
                 next = list->next;
-                DLIST_REMOVE(list_head, list);
+                DLIST_REMOVE(l_head, list);
                 SAFE_FREE(list->file_path);
                 SAFE_FREE(list);

branches/samba-3.3.x/source/client/mount.cifs.c

@@ -86 +86 @@
 const char *thisprogram;
 int verboseflag = 0;
+int fakemnt = 0;
 static int got_password = 0;
 static int got_user = 0;
@@ -1031 +1032 @@
         char * temp;
         char * dev_name;
-        int rc;
+        int rc = 0;
         int rsize = 0;
         int wsize = 0;
@@ -1104 +1105 @@
                         exit(EX_USAGE);
                 case 'n':
-                    ++nomtab;
-                    break;
+                        ++nomtab;
+                        break;
                 case 'b':
 #ifdef MS_BIND
@@ -1209 +1210 @@
                         break;
                 case 't':
+                        break;
+                case 'f':
+                        ++fakemnt;
                         break;
                 default:
@@ -1411 +1415 @@
         }
 
-        if (mount(dev_name, mountpoint, "cifs", flags, options)) {
+        if (!fakemnt && mount(dev_name, mountpoint, "cifs", flags, options)) {
                 switch (errno) {
                 case ECONNREFUSED:
@@ -1441 +1445 @@
         }
 
+        if (nomtab)
+                goto mount_exit;
         atexit(unlock_mtab);
         rc = lock_mtab();

branches/samba-3.3.x/source/client/umount.cifs.c

@@ -34 +34 @@
 #include <string.h>
 #include <mntent.h>
+#include <limits.h>
 #include "mount.h"
 
@@ -232 +233 @@
 }
 
+/* Make a canonical pathname from PATH.  Returns a freshly malloced string.
+   It is up the *caller* to ensure that the PATH is sensible.  i.e.
+   canonicalize ("/dev/fd0/.") returns "/dev/fd0" even though ``/dev/fd0/.''
+   is not a legal pathname for ``/dev/fd0''  Anything we cannot parse
+   we return unmodified.   */
+static char *
+canonicalize(char *path)
+{
+        char *canonical;
+
+        if (path == NULL) {
+                return NULL;
+        }
+
+        if (strlen(path) > PATH_MAX) {
+                fprintf(stderr, "Mount point string too long\n");
+                return NULL;
+        }
+
+        canonical = (char *)malloc (PATH_MAX + 1);
+
+        if (!canonical) {
+                fprintf(stderr, "Error! Not enough memory!\n");
+                return NULL;
+        }
+
+        if (realpath (path, canonical))
+                return canonical;
+
+        strncpy (canonical, path, PATH_MAX);
+        canonical[PATH_MAX] = '\0';
+        return canonical;
+}
+
 int main(int argc, char ** argv)
 {
@@ -305 +340 @@
         argc -= optind;
 
-        mountpoint = argv[0];
+        mountpoint = canonicalize(argv[0]);
 
         if((argc < 1) || (argv[0] == NULL)) {