Changeset 233 for branches/samba-3.2.x/source/client

Timestamp:

May 27, 2009, 11:39:15 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.9

Location:

branches/samba-3.2.x/source/client

Files:

• clitar.c (modified) (2 diffs)
• mount.cifs.c (modified) (11 diffs)
• umount.cifs.c (modified) (3 diffs)

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

@@ -1507 +1507 @@
                                         if (strrchr_m(cliplist[i], '\\')) {
                                                 char *p;
+                                                char saved_char;
                                                 char *saved_dir = talloc_strdup(ctx,
                                                                         client_get_cur_dir());
@@ -1525 +1526 @@
                                                         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.2.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;
@@ -485 +486 @@
                 } else if (strncmp(data, "sec", 3) == 0) {
                         if (value) {
-                                if (!strcmp(value, "none"))
+                                if (!strncmp(value, "none", 4) ||
+                                    !strncmp(value, "krb5", 4))
                                         got_password = 1;
                         }
@@ -533 +535 @@
                                 return 1;
                         }
-                } else if ((strncmp(data, "domain", 3) == 0)
-                           || (strncmp(data, "workgroup", 5) == 0)) {
+                } else if ((strncmp(data, "dom" /* domain */, 3) == 0)
+                           || (strncmp(data, "workg", 5) == 0)) {
+                        /* note this allows for synonyms of "domain"
+                           such as "DOM" and "dom" and "workgroup"
+                           and "WORKGRP" etc. */
                         if (!value || !*value) {
                                 printf("CIFS: invalid domain name\n");
@@ -646 +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;
@@ -1027 +1034 @@
         char * temp;
         char * dev_name;
-        int rc;
+        int rc = 0;
         int rsize = 0;
         int wsize = 0;
@@ -1075 +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);
@@ -1100 +1115 @@
                         exit(EX_USAGE);
                 case 'n':
-                    ++nomtab;
-                    break;
+                        ++nomtab;
+                        break;
                 case 'b':
 #ifdef MS_BIND
@@ -1205 +1220 @@
                         break;
                 case 't':
+                        break;
+                case 'f':
+                        ++fakemnt;
                         break;
                 default:
@@ -1283 +1301 @@
 
         if(got_user == 0) {
-                user_name = getusername();
+                /* Note that the password will not be retrieved from the
+                   USER env variable (ie user%password form) as there is
+                   already a PASSWD environment varaible */
+                if (getenv("USER"))
+                        user_name = strdup(getenv("USER"));
+                if (user_name == NULL)
+                        user_name = getusername();
                 got_user = 1;
         }
@@ -1401 +1425 @@
         }
 
-        if (mount(dev_name, mountpoint, "cifs", flags, options)) {
+        if (!fakemnt && mount(dev_name, mountpoint, "cifs", flags, options)) {
                 switch (errno) {
                 case ECONNREFUSED:
@@ -1431 +1455 @@
         }
 
+        if (nomtab)
+                goto mount_exit;
         atexit(unlock_mtab);
         rc = lock_mtab();

branches/samba-3.2.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)) {