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

Timestamp:

Oct 8, 2009, 8:10:05 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.3. to 3.3.8 (security update)

File:

• branches/samba-3.3.x/source/client/mount.cifs.c (modified) (7 diffs)

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

@@ -200 +200 @@
         FILE * fs;
         int i, length;
+
+        i = access(file_name, R_OK);
+        if (i)
+                return i;
+
         fs = fopen(file_name,"r");
         if(fs == NULL)
@@ -322 +327 @@
 
         if(filename != NULL) {
+                rc = access(filename, R_OK);
+                if (rc) {
+                        fprintf(stderr, "mount.cifs failed: access check of %s failed: %s\n",
+                                        filename, strerror(errno));
+                        exit(EX_SYSERR);
+                }
                 file_descript = open(filename, O_RDONLY);
                 if(file_descript < 0) {
@@ -380 +391 @@
                 return 1;
         data = *optionsp;
-
-        if(verboseflag)
-                printf("parsing options: %s\n", data);
 
         /* BB fixme check for separator override BB */
@@ -472 +480 @@
                         if (!value || !*value) {
                                 if(got_password) {
-                                        printf("\npassword specified twice, ignoring second\n");
+                                        fprintf(stderr, "\npassword specified twice, ignoring second\n");
                                 } else
                                         got_password = 1;
-                        } else if (strnlen(value, 17) < 17) {
-                                if(got_password)
-                                        printf("\nmount.cifs warning - password specified twice\n");
-                                got_password = 1;
+                        } else if (strnlen(value, MOUNT_PASSWD_SIZE) < MOUNT_PASSWD_SIZE) {
+                                if (got_password) {
+                                        fprintf(stderr, "\nmount.cifs warning - password specified twice\n");
+                                } else {
+                                        mountpassword = strndup(value, MOUNT_PASSWD_SIZE);
+                                        if (!mountpassword) {
+                                                fprintf(stderr, "mount.cifs error: %s", strerror(ENOMEM));
+                                                SAFE_FREE(out);
+                                                return 1;
+                                        }
+                                        got_password = 1;
+                                }
                         } else {
-                                printf("password too long\n");
+                                fprintf(stderr, "password too long\n");
                                 SAFE_FREE(out);
                                 return 1;
                         }
+                        goto nocopy;
                 } else if (strncmp(data, "sec", 3) == 0) {
                         if (value) {
@@ -1371 +1388 @@
                 }
         }
-        if(mountpassword) {
-                /* Commas have to be doubled, or else they will
-                look like the parameter separator */
-/*              if(sep is not set)*/
-                if(retry == 0)
-                        check_for_comma(&mountpassword);
-                strlcat(options,",pass=",options_size);
-                strlcat(options,mountpassword,options_size);
-        }
 
         strlcat(options,",ver=",options_size);
@@ -1392 +1400 @@
                 strlcat(options,prefixpath,options_size); /* no need to cat the / */
         }
-        if(verboseflag)
-                printf("\nmount.cifs kernel mount options %s \n",options);
 
         /* convert all '\\' to '/' in share portion so that /proc/mounts looks pretty */
@@ -1424 +1430 @@
                 }
         }
+
+        if(verboseflag)
+                fprintf(stderr, "\nmount.cifs kernel mount options: %s", options);
+
+        if (mountpassword) {
+                /*
+                 * Commas have to be doubled, or else they will
+                 * look like the parameter separator
+                 */
+                if(retry == 0)
+                        check_for_comma(&mountpassword);
+                strlcat(options,",pass=",options_size);
+                strlcat(options,mountpassword,options_size);
+                if (verboseflag)
+                        fprintf(stderr, ",pass=********");
+        }
+
+        if (verboseflag)
+                fprintf(stderr, "\n");
 
         if (!fakemnt && mount(dev_name, mountpoint, "cifs", flags, options)) {