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

Timestamp:

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

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.2

Location:

branches/samba-3.3.x/source/client

Files:

• clitar.c (modified) (2 diffs)
• mount.cifs.c (modified) (2 diffs)

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

@@ -1514 +1514 @@
                                         if (strrchr_m(cliplist[i], '\\')) {
                                                 char *p;
+                                                char saved_char;
                                                 char *saved_dir = talloc_strdup(ctx,
                                                                         client_get_cur_dir());
@@ -1532 +1533 @@
                                                         return 1;
                                                 }
+                                                /*
+                                                 * Strip off the last \\xxx
+                                                 * xxx element of tarmac to set
+                                                 * it as current directory.
+                                                 */
                                                 p = strrchr_m(tarmac, '\\');
                                                 if (!p) {
                                                         return 1;
                                                 }
+                                                saved_char = p[1];
                                                 p[1] = '\0';
+
                                                 client_set_cur_dir(tarmac);
+
+                                                /*
+                                                 * Restore the character we
+                                                 * just replaced to
+                                                 * put the pathname
+                                                 * back as it was.
+                                                 */
+                                                p[1] = saved_char;
 
                                                 DEBUG(5, ("process_tar, do_list with tarmac: %s\n", tarmac));

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

@@ -651 +651 @@
                         *filesys_flags &= ~MS_NOEXEC;
                 } else if (strncmp(data, "guest", 5) == 0) {
-                        got_password=1;
+                        user_name = (char *)calloc(1, 1);
+                        got_user = 1;
+                        got_password = 1;
                 } else if (strncmp(data, "ro", 2) == 0) {
                         *filesys_flags |= MS_RDONLY;
@@ -1080 +1082 @@
                 mountpoint = argv[2];
         } else {
+                if ((strcmp (argv[1], "--version") == 0) ||
+                    ((strcmp (argv[1], "-V") == 0))) {
+                        printf ("mount.cifs version: %s.%s%s\n",
+                        MOUNT_CIFS_VERSION_MAJOR,
+                        MOUNT_CIFS_VERSION_MINOR,
+                        MOUNT_CIFS_VENDOR_SUFFIX);
+                        exit (0);
+                }
                 mount_cifs_usage();
                 exit(EX_USAGE);