r1616: Fix user unmount of shares mount with suid mount.cifs

(This used to be commit 2bd28007159a3ce4a1b8737218e7b75bc2286682)

diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index 5670a147468c172efb7f68e95037f7f9d60fcdc6..55934e04b3c66f0909e16e8e9fe74ad2b8f96aa5 100755 (executable)
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -38,7 +38,7 @@
 #include <fcntl.h>
 
 #define MOUNT_CIFS_VERSION_MAJOR "1"
-#define MOUNT_CIFS_VERSION_MINOR "3"
+#define MOUNT_CIFS_VERSION_MINOR "4"
 
 #ifndef MOUNT_CIFS_VENDOR_SUFFIX
 #define MOUNT_CIFS_VENDOR_SUFFIX ""
@@ -57,6 +57,7 @@ static int got_ip = 0;
 static int got_unc = 0;
 static int got_uid = 0;
 static int got_gid = 0;
+static int free_share_name = 0;
 static char * user_name = NULL;
 char * mountpassword = NULL;
 
@@ -502,8 +503,9 @@ static int parse_options(char * options, int * filesys_flags)
 }
 
 /* Note that caller frees the returned buffer if necessary */
-char * parse_server(char * unc_name)
+char * parse_server(char ** punc_name)
 {
+       char * unc_name = *punc_name;
        int length = strnlen(unc_name,1024);
        char * share;
        char * ipaddress_string = NULL;
@@ -527,11 +529,23 @@ char * parse_server(char * unc_name)
                return 0;
        } else {
                if(strncmp(unc_name,"//",2) && strncmp(unc_name,"\\\\",2)) {
-                       printf("mount error: improperly formatted UNC name.");
-                       printf(" %s does not begin with \\\\ or //\n",unc_name);
-                       return 0;
+                       /* check for nfs syntax ie server:share */
+                       share = strchr(unc_name,':');
+                       if(share) {
+                               free_share_name = 1;
+                               *punc_name = malloc(length+3);
+                               *share = '/';
+                               strncpy((*punc_name)+2,unc_name,length);
+                               unc_name = *punc_name;
+                               unc_name[length+2] = 0;
+                               goto continue_unc_parsing;
+                       } else {
+                               printf("mount error: improperly formatted UNC name.");
+                               printf(" %s does not begin with \\\\ or //\n",unc_name);
+                               return 0;
+                       }
                } else {
-                       unc_name[0] = '\\';
+continue_unc_parsing:
                        unc_name[0] = '/';
                        unc_name[1] = '/';
                        unc_name += 2;
@@ -753,8 +767,7 @@ int main(int argc, char ** argv)
                get_password_from_file(0, getenv("PASSWD_FILE"));
        }
 
-       ipaddr = parse_server(share_name);
-
+       ipaddr = parse_server(&share_name);
        if(ipaddr == NULL)
                return -1;
        
@@ -879,8 +892,9 @@ int main(int argc, char ** argv)
                        mountent.mnt_fsname = share_name;
                        mountent.mnt_dir = mountpoint; 
                        mountent.mnt_type = "cifs"; 
-                       mountent.mnt_opts = malloc(200);
+                       mountent.mnt_opts = malloc(220);
                        if(mountent.mnt_opts) {
+                               char * mount_user = getusername();
                                memset(mountent.mnt_opts,0,200);
                                if(flags & MS_RDONLY)
                                        strcat(mountent.mnt_opts,"ro");
@@ -898,6 +912,13 @@ int main(int argc, char ** argv)
                                        strcat(mountent.mnt_opts,",nodev");
                                if(flags & MS_SYNCHRONOUS)
                                        strcat(mountent.mnt_opts,",synch");
+                               if(mount_user) {
+                                       if(getuid() != 0) {
+                                               strcat(mountent.mnt_opts,",user=");
+                                               strcat(mountent.mnt_opts,mount_user);
+                                       }
+                                       free(mount_user);
+                               }
                        }
                        mountent.mnt_freq = 0;
                        mountent.mnt_passno = 0;
@@ -927,6 +948,9 @@ int main(int argc, char ** argv)
                free(resolved_path);
        }
 
+       if(free_share_name) {
+               free(share_name);
+               }
        return 0;
 }