Replace cli_rpc_pipe_close by a talloc destructor on rpc_pipe_struct
[kai/samba.git] / source / client / mount.cifs.c
old mode 100755 (executable)
new mode 100644 (file)
index 103e369..fdee87a
@@ -4,7 +4,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -13,8 +13,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef _GNU_SOURCE
 #define _GNU_SOURCE
 #include <string.h>
 #include <mntent.h>
 #include <fcntl.h>
+#include <limits.h>
 
 #define MOUNT_CIFS_VERSION_MAJOR "1"
-#define MOUNT_CIFS_VERSION_MINOR "10"
+#define MOUNT_CIFS_VERSION_MINOR "11"
 
 #ifndef MOUNT_CIFS_VENDOR_SUFFIX
  #ifdef _SAMBA_BUILD_
 #define MS_MOVE 8192 
 #endif 
 
+#ifndef MS_BIND
+#define MS_BIND 4096
+#endif
+
+#define MAX_UNC_LEN 1024
+
 #define CONST_DISCARD(type, ptr)      ((type) ((void *) (ptr)))
 
 const char *thisprogram;
@@ -70,11 +76,45 @@ 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;
 static char * mountpassword = NULL;
 char * domain_name = NULL;
+char * prefixpath = NULL;
+
+/* glibc doesn't have strlcpy, strlcat. Ensure we do. JRA. We
+ * don't link to libreplace so need them here. */
+
+/* like strncpy but does not 0 fill the buffer and always null
+ *    terminates. bufsize is the size of the destination buffer */
+size_t strlcpy(char *d, const char *s, size_t bufsize)
+{
+       size_t len = strlen(s);
+       size_t ret = len;
+       if (bufsize <= 0) return 0;
+       if (len >= bufsize) len = bufsize-1;
+       memcpy(d, s, len);
+       d[len] = 0;
+       return ret;
+}
+
+/* like strncat but does not 0 fill the buffer and always null
+ *    terminates. bufsize is the length of the buffer, which should
+ *       be one more than the maximum resulting string length */
+size_t strlcat(char *d, const char *s, size_t bufsize)
+{
+       size_t len1 = strlen(d);
+       size_t len2 = strlen(s);
+       size_t ret = len1 + len2;
 
+       if (len1+len2 >= bufsize) {
+               len2 = bufsize - (len1+1);
+       }
+       if (len2 > 0) {
+               memcpy(d+len1, s, len2);
+               d[len1+len2] = 0;
+       }
+       return ret;
+}
 
 /* BB finish BB
 
@@ -97,14 +137,16 @@ static void mount_cifs_usage(void)
        printf("\nLess commonly used options:");
        printf("\n\tcredentials=<filename>,guest,perm,noperm,setuids,nosetuids,rw,ro,");
        printf("\n\tsep=<char>,iocharset=<codepage>,suid,nosuid,exec,noexec,serverino,");
-       printf("\n\tdirectio,mapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+       printf("\n\tmapchars,nomapchars,nolock,servernetbiosname=<SRV_RFC1001NAME>");
+       printf("\n\tdirectio,nounix,cifsacl,sec=<authentication mechanism>,sign");
        printf("\n\nOptions not needed for servers supporting CIFS Unix extensions");
        printf("\n\t(e.g. unneeded for mounts to most Samba versions):");
        printf("\n\tuid=<uid>,gid=<gid>,dir_mode=<mode>,file_mode=<mode>,sfu");
        printf("\n\nRarely used options:");
        printf("\n\tport=<tcpport>,rsize=<size>,wsize=<size>,unc=<unc_name>,ip=<ip_address>,");
        printf("\n\tdev,nodev,nouser_xattr,netbiosname=<OUR_RFC1001NAME>,hard,soft,intr,");
-       printf("\n\tnointr,ignorecase,noposixpaths,noacl");
+       printf("\n\tnointr,ignorecase,noposixpaths,noacl,prefixpath=<path>,nobrl");
+       printf("\n\tin6_addr");
        printf("\n\nOptions are described in more detail in the manual page");
        printf("\n\tman 8 mount.cifs\n");
        printf("\nTo display the version number of the mount helper:");
@@ -143,7 +185,7 @@ static int open_cred_file(char * file_name)
        fs = fopen(file_name,"r");
        if(fs == NULL)
                return errno;
-       line_buf = malloc(4096);
+       line_buf = (char *)malloc(4096);
        if(line_buf == NULL) {
                fclose(fs);
                return -ENOMEM;
@@ -164,8 +206,10 @@ static int open_cred_file(char * file_name)
                                /* go past equals sign */
                                temp_val++;
                                for(length = 0;length<4087;length++) {
-                                       if(temp_val[length] == '\n')
+                                       if ((temp_val[length] == '\n')
+                                           || (temp_val[length] == '\0')) {
                                                break;
+                                       }
                                }
                                if(length > 4086) {
                                        printf("mount.cifs failed due to malformed username in credentials file");
@@ -176,7 +220,7 @@ static int open_cred_file(char * file_name)
                                        exit(1);
                                } else {
                                        got_user = 1;
-                                       user_name = calloc(1 + length,1);
+                                       user_name = (char *)calloc(1 + length,1);
                                        /* BB adding free of user_name string before exit,
                                                not really necessary but would be cleaner */
                                        strncpy(user_name,temp_val, length);
@@ -188,8 +232,10 @@ static int open_cred_file(char * file_name)
                                /* go past equals sign */
                                temp_val++;
                                for(length = 0;length<65;length++) {
-                                       if(temp_val[length] == '\n')
+                                       if ((temp_val[length] == '\n')
+                                           || (temp_val[length] == '\0')) {
                                                break;
+                                       }
                                }
                                if(length > 64) {
                                        printf("mount.cifs failed: password in credentials file too long\n");
@@ -200,7 +246,7 @@ static int open_cred_file(char * file_name)
                                        exit(1);
                                } else {
                                        if(mountpassword == NULL) {
-                                               mountpassword = calloc(65,1);
+                                               mountpassword = (char *)calloc(65,1);
                                        } else
                                                memset(mountpassword,0,64);
                                        if(mountpassword) {
@@ -217,8 +263,10 @@ static int open_cred_file(char * file_name)
                                if(verboseflag)
                                        printf("\nDomain %s\n",temp_val);
                                 for(length = 0;length<65;length++) {
-                                        if(temp_val[length] == '\n')
-                                                break;
+                                       if ((temp_val[length] == '\n')
+                                           || (temp_val[length] == '\0')) {
+                                               break;
+                                       }
                                 }
                                 if(length > 64) {
                                         printf("mount.cifs failed: domain in credentials file too long\n");
@@ -228,7 +276,7 @@ static int open_cred_file(char * file_name)
                                         exit(1);
                                 } else {
                                         if(domain_name == NULL) {
-                                                domain_name = calloc(65,1);
+                                                domain_name = (char *)calloc(65,1);
                                         } else
                                                 memset(domain_name,0,64);
                                         if(domain_name) {
@@ -255,10 +303,15 @@ static int get_password_from_file(int file_descript, char * filename)
        char c;
 
        if(mountpassword == NULL)
-               mountpassword = calloc(65,1);
+               mountpassword = (char *)calloc(65,1);
        else 
                memset(mountpassword, 0, 64);
 
+       if (mountpassword == NULL) {
+               printf("malloc failed\n");
+               exit(1);
+       }
+
        if(filename != NULL) {
                file_descript = open(filename, O_RDONLY);
                if(file_descript < 0) {
@@ -311,6 +364,8 @@ static int parse_options(char ** optionsp, int * filesys_flags)
        int out_len = 0;
        int word_len;
        int rc = 0;
+       char user[32];
+       char group[32];
 
        if (!optionsp || !*optionsp)
                return 1;
@@ -321,6 +376,13 @@ static int parse_options(char ** optionsp, int * filesys_flags)
 
        /* BB fixme check for separator override BB */
 
+       if (getuid()) {
+               got_uid = 1;
+               snprintf(user,sizeof(user),"%u",getuid());
+               got_gid = 1;
+               snprintf(group,sizeof(group),"%u",getgid());
+       }
+
 /* while ((data = strsep(&options, ",")) != NULL) { */
        while(data != NULL) {
                /*  check if ends with trailing comma */
@@ -369,7 +431,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
                                        if(percent_char) {
                                                *percent_char = ',';
                                                if(mountpassword == NULL)
-                                                       mountpassword = calloc(65,1);
+                                                       mountpassword = (char *)calloc(65,1);
                                                if(mountpassword) {
                                                        if(got_password)
                                                                printf("\nmount.cifs warning - password specified twice\n");
@@ -409,6 +471,11 @@ static int parse_options(char ** optionsp, int * filesys_flags)
                                printf("password too long\n");
                                return 1;
                        }
+               } else if (strncmp(data, "sec", 3) == 0) {
+                       if (value) {
+                               if (!strcmp(value, "none"))
+                                       got_password = 1;
+                       }
                } else if (strncmp(data, "ip", 2) == 0) {
                        if (!value || !*value) {
                                printf("target ip address argument missing");
@@ -478,33 +545,33 @@ static int parse_options(char ** optionsp, int * filesys_flags)
                                got_uid = 1;
                                if (!isdigit(*value)) {
                                        struct passwd *pw;
-                                       static char temp[32];
 
                                        if (!(pw = getpwnam(value))) {
                                                printf("bad user name \"%s\"\n", value);
                                                exit(1);
                                        }
-                                       sprintf(temp, "%u", pw->pw_uid);
-                                       value = temp;
-                                       endpwent();
+                                       snprintf(user, sizeof(user), "%u", pw->pw_uid);
+                               } else {
+                                       strlcpy(user,value,sizeof(user));
                                }
                        }
+                       goto nocopy;
                } else if (strncmp(data, "gid", 3) == 0) {
                        if (value && *value) {
                                got_gid = 1;
                                if (!isdigit(*value)) {
                                        struct group *gr;
-                                       static char temp[32];
 
                                        if (!(gr = getgrnam(value))) {
                                                printf("bad group name \"%s\"\n", value);
                                                exit(1);
                                        }
-                                       sprintf(temp, "%u", gr->gr_gid);
-                                       value = temp;
-                                       endpwent();
+                                       snprintf(group, sizeof(group), "%u", gr->gr_gid);
+                               } else {
+                                       strlcpy(group,value,sizeof(group));
                                }
                        }
+                       goto nocopy;
        /* fmask and dmask synonyms for people used to smbfs syntax */
                } else if (strcmp(data, "file_mode") == 0 || strcmp(data, "fmask")==0) {
                        if (!value || !*value) {
@@ -557,8 +624,6 @@ static int parse_options(char ** optionsp, int * filesys_flags)
                        *filesys_flags &= ~MS_NOEXEC;
                } else if (strncmp(data, "guest", 5) == 0) {
                        got_password=1;
-                        /* remove the parm since it would otherwise be logged by kern */
-                       goto nocopy;
                } else if (strncmp(data, "ro", 2) == 0) {
                        *filesys_flags |= MS_RDONLY;
                } else if (strncmp(data, "rw", 2) == 0) {
@@ -591,23 +656,62 @@ static int parse_options(char ** optionsp, int * filesys_flags)
                if (value)
                        word_len += 1 + strlen(value);
 
-               out = realloc(out, out_len + word_len + 2);
+               out = (char *)realloc(out, out_len + word_len + 2);
                if (out == NULL) {
                        perror("malloc");
                        exit(1);
                }
 
-               if (out_len)
-                       out[out_len++] = ',';
+               if (out_len) {
+                       strlcat(out, ",", out_len + word_len + 2);
+                       out_len++;
+               }
+
                if (value)
-                       sprintf(out + out_len, "%s=%s", data, value);
+                       snprintf(out + out_len, word_len + 1, "%s=%s", data, value);
                else
-                       sprintf(out + out_len, "%s", data);
+                       snprintf(out + out_len, word_len + 1, "%s", data);
                out_len = strlen(out);
 
 nocopy:
                data = next_keyword;
        }
+
+       /* special-case the uid and gid */
+       if (got_uid) {
+               word_len = strlen(user);
+
+               out = (char *)realloc(out, out_len + word_len + 6);
+               if (out == NULL) {
+                       perror("malloc");
+                       exit(1);
+               }
+
+               if (out_len) {
+                       strlcat(out, ",", out_len + word_len + 6);
+                       out_len++;
+               }
+               snprintf(out + out_len, word_len + 5, "uid=%s", user);
+               out_len = strlen(out);
+       }
+       if (got_gid) {
+               word_len = strlen(group);
+
+               out = (char *)realloc(out, out_len + 1 + word_len + 6);
+               if (out == NULL) {
+               perror("malloc");
+                       exit(1);
+               }
+
+               if (out_len) {
+                       strlcat(out, ",", out_len + word_len + 6);
+                       out_len++;
+               }
+               snprintf(out + out_len, word_len + 5, "gid=%s", group);
+               out_len = strlen(out);
+       }
+
+       free(*optionsp);
        *optionsp = out;
        return 0;
 }
@@ -641,7 +745,7 @@ static void check_for_comma(char ** ppasswrd)
                return;
        }
 
-       new_pass_buf = malloc(len+number_of_commas+1);
+       new_pass_buf = (char *)malloc(len+number_of_commas+1);
        if(new_pass_buf == NULL)
                return;
 
@@ -705,11 +809,11 @@ static char * check_for_domain(char **ppuser)
        len = strlen(domainnm);
        /* reset domainm to new buffer, and copy
        domain name into it */
-       domainnm = malloc(len+1);
+       domainnm = (char *)malloc(len+1);
        if(domainnm == NULL)
                return NULL;
 
-       strcpy(domainnm,*ppuser);
+       strlcpy(domainnm,*ppuser,len+1);
 
 /*     move_string(*ppuser, usernm+1) */
        len = strlen(usernm+1);
@@ -734,17 +838,31 @@ static char * check_for_domain(char **ppuser)
        return domainnm;
 }
 
+/* replace all occurances of "from" in a string with "to" */
+static void replace_char(char *string, char from, char to, int maxlen)
+{
+       char *lastchar = string + maxlen;
+       while (string) {
+               string = strchr(string, from);
+               if (string) {
+                       *string = to;
+                       if (string >= lastchar)
+                               return;
+               }
+       }
+}
+
 /* Note that caller frees the returned buffer if necessary */
 static char * parse_server(char ** punc_name)
 {
        char * unc_name = *punc_name;
-       int length = strnlen(unc_name,1024);
+       int length = strnlen(unc_name, MAX_UNC_LEN);
        char * share;
        char * ipaddress_string = NULL;
        struct hostent * host_entry = NULL;
        struct in_addr server_ipaddr;
 
-       if(length > 1023) {
+       if(length > (MAX_UNC_LEN - 1)) {
                printf("mount error: UNC name too long");
                return NULL;
        }
@@ -756,24 +874,23 @@ static char * parse_server(char ** punc_name)
 
        if(length < 3) {
                /* BB add code to find DFS root here */
-               printf("\nMounting the DFS root for domain not implemented yet");
+               printf("\nMounting the DFS root for domain not implemented yet\n");
                return NULL;
        } else {
                if(strncmp(unc_name,"//",2) && strncmp(unc_name,"\\\\",2)) {
                        /* check for nfs syntax ie server:share */
                        share = strchr(unc_name,':');
                        if(share) {
-                               free_share_name = 1;
-                               *punc_name = malloc(length+3);
+                               *punc_name = (char *)malloc(length+3);
                                if(*punc_name == NULL) {
                                        /* put the original string back  if 
                                           no memory left */
                                        *punc_name = unc_name;
                                        return NULL;
                                }
-                                       
                                *share = '/';
                                strncpy((*punc_name)+2,unc_name,length);
+                               free(unc_name);
                                unc_name = *punc_name;
                                unc_name[length+2] = 0;
                                goto continue_unc_parsing;
@@ -787,14 +904,22 @@ continue_unc_parsing:
                        unc_name[0] = '/';
                        unc_name[1] = '/';
                        unc_name += 2;
-                       if ((share = strchr(unc_name, '/')) || 
-                               (share = strchr(unc_name,'\\'))) {
+
+                       /* allow for either delimiter between host and sharename */
+                       if ((share = strpbrk(unc_name, "/\\"))) {
                                *share = 0;  /* temporarily terminate the string */
                                share += 1;
                                if(got_ip == 0) {
                                        host_entry = gethostbyname(unc_name);
                                }
-                               *(share - 1) = '/'; /* put the slash back */
+                               *(share - 1) = '/'; /* put delimiter back */
+
+                               /* we don't convert the prefixpath delimiters since '\\' is a valid char in posix paths */
+                               if ((prefixpath = strpbrk(share, "/\\"))) {
+                                       *prefixpath = 0;  /* permanently terminate the string */
+                                       if (!strlen(++prefixpath))
+                                               prefixpath = NULL; /* this needs to be done explicitly */
+                               }
                                if(got_ip) {
                                        if(verboseflag)
                                                printf("ip address specified explicitly\n");
@@ -855,6 +980,25 @@ static struct option longopts[] = {
        { NULL, 0, NULL, 0 }
 };
 
+/* convert a string to uppercase. return false if the string
+ * wasn't ASCII or was a NULL ptr */
+static int
+uppercase_string(char *string)
+{
+       if (!string)
+               return 0;
+
+       while (*string) {
+               /* check for unicode */
+               if ((unsigned char) string[0] & 0x80)
+                       return 0;
+               *string = toupper((unsigned char) *string);
+               string++;
+       }
+
+       return 1;
+}
+
 int main(int argc, char ** argv)
 {
        int c;
@@ -864,9 +1008,10 @@ int main(int argc, char ** argv)
        char * ipaddr = NULL;
        char * uuid = NULL;
        char * mountpoint = NULL;
-       char * options;
-       char * resolved_path;
+       char * options = NULL;
+       char * resolved_path = NULL;
        char * temp;
+       char * dev_name;
        int rc;
        int rsize = 0;
        int wsize = 0;
@@ -875,6 +1020,7 @@ int main(int argc, char ** argv)
        int gid = 0;
        int optlen = 0;
        int orgoptlen = 0;
+       size_t options_size = 0;
        int retry = 0; /* set when we have to retry mount with uppercase */
        struct stat statbuf;
        struct utsname sysinfo;
@@ -887,7 +1033,11 @@ int main(int argc, char ** argv)
 
        if(argc && argv) {
                thisprogram = argv[0];
+       } else {
+               mount_cifs_usage();
+               exit(1);
        }
+
        if(thisprogram == NULL)
                thisprogram = "mount.cifs";
 
@@ -898,8 +1048,16 @@ int main(int argc, char ** argv)
        printf(" node: %s machine: %s sysname %s domain %s\n", sysinfo.nodename,sysinfo.machine,sysinfo.sysname,sysinfo.domainname);
 #endif */
        if(argc > 2) {
-               share_name = argv[1];
+               dev_name = argv[1];
+               share_name = strndup(argv[1], MAX_UNC_LEN);
+               if (share_name == NULL) {
+                       fprintf(stderr, "%s: %s", argv[0], strerror(ENOMEM));
+                       exit(1);
+               }
                mountpoint = argv[2];
+       } else {
+               mount_cifs_usage();
+               exit(1);
        }
 
        /* add sharename in opts string as unc= parm */
@@ -926,10 +1084,20 @@ int main(int argc, char ** argv)
                    ++nomtab;
                    break;
                case 'b':
+#ifdef MS_BIND
                        flags |= MS_BIND;
+#else
+                       fprintf(stderr,
+                               "option 'b' (MS_BIND) not supported\n");
+#endif
                        break;
                case 'm':
+#ifdef MS_MOVE               
                        flags |= MS_MOVE;
+#else
+                       fprintf(stderr,
+                               "option 'm' (MS_MOVE) not supported\n");
+#endif
                        break;
                case 'o':
                        orgoptions = strdup(optarg);
@@ -1011,7 +1179,7 @@ int main(int argc, char ** argv)
                        break;
                case 'p':
                        if(mountpassword == NULL)
-                               mountpassword = calloc(65,1);
+                               mountpassword = (char *)calloc(65,1);
                        if(mountpassword) {
                                got_password = 1;
                                strncpy(mountpassword,optarg,64);
@@ -1029,14 +1197,14 @@ int main(int argc, char ** argv)
                }
        }
 
-       if((argc < 3) || (share_name == NULL) || (mountpoint == NULL)) {
+       if((argc < 3) || (dev_name == NULL) || (mountpoint == NULL)) {
                mount_cifs_usage();
                exit(1);
        }
 
        if (getenv("PASSWD")) {
                if(mountpassword == NULL)
-                       mountpassword = calloc(65,1);
+                       mountpassword = (char *)calloc(65,1);
                if(mountpassword) {
                        strncpy(mountpassword,getenv("PASSWD"),64);
                        got_password = 1;
@@ -1047,16 +1215,19 @@ int main(int argc, char ** argv)
                get_password_from_file(0, getenv("PASSWD_FILE"));
        }
 
-        if (orgoptions && parse_options(&orgoptions, &flags))
-                return -1;
+        if (orgoptions && parse_options(&orgoptions, &flags)) {
+                rc = -1;
+               goto mount_exit;
+       }
        ipaddr = parse_server(&share_name);
        if((ipaddr == NULL) && (got_ip == 0)) {
                printf("No ip address specified and hostname not found\n");
-               return -1;
+               rc = -1;
+               goto mount_exit;
        }
        
        /* BB save off path and pop after mount returns? */
-       resolved_path = malloc(PATH_MAX+1);
+       resolved_path = (char *)malloc(PATH_MAX+1);
        if(resolved_path) {
                /* Note that if we can not canonicalize the name, we get
                another chance to see if it is valid when we chdir to it */
@@ -1066,17 +1237,20 @@ int main(int argc, char ** argv)
        }
        if(chdir(mountpoint)) {
                printf("mount error: can not change directory into mount target %s\n",mountpoint);
-               return -1;
+               rc = -1;
+               goto mount_exit;
        }
 
        if(stat (".", &statbuf)) {
                printf("mount error: mount point %s does not exist\n",mountpoint);
-               return -1;
+               rc = -1;
+               goto mount_exit;
        }
 
        if (S_ISDIR(statbuf.st_mode) == 0) {
                printf("mount error: mount point %s is not a directory\n",mountpoint);
-               return -1;
+               rc = -1;
+               goto mount_exit;
        }
 
        if((getuid() != 0) && (geteuid() == 0)) {
@@ -1113,6 +1287,8 @@ mount_retry:
                optlen += strlen(share_name) + 4;
        else {
                printf("No server share name specified\n");
+               printf("\nMounting the DFS root for server not implemented yet\n");
+                exit(1);
        }
        if(user_name)
                optlen += strlen(user_name) + 6;
@@ -1120,38 +1296,40 @@ mount_retry:
                optlen += strlen(ipaddr) + 4;
        if(mountpassword)
                optlen += strlen(mountpassword) + 6;
-       options = malloc(optlen + 10 + 64 /* space for commas in password */ + 8 /* space for domain=  , domain name itself was counted as part of the length username string above */);
+       if(options)
+               free(options);
+       options_size = optlen + 10 + 64;
+       options = (char *)malloc(options_size /* space for commas in password */ + 8 /* space for domain=  , domain name itself was counted as part of the length username string above */);
 
        if(options == NULL) {
                printf("Could not allocate memory for mount options\n");
                return -1;
        }
-               
 
        options[0] = 0;
-       strncat(options,"unc=",4);
-       strcat(options,share_name);
+       strlcpy(options,"unc=",options_size);
+       strlcat(options,share_name,options_size);
        /* scan backwards and reverse direction of slash */
        temp = strrchr(options, '/');
        if(temp > options + 6)
                *temp = '\\';
        if(ipaddr) {
-               strncat(options,",ip=",4);
-               strcat(options,ipaddr);
+               strlcat(options,",ip=",options_size);
+               strlcat(options,ipaddr,options_size);
        }
 
        if(user_name) {
                /* check for syntax like user=domain\user */
                if(got_domain == 0)
                        domain_name = check_for_domain(&user_name);
-               strncat(options,",user=",6);
-               strcat(options,user_name);
+               strlcat(options,",user=",options_size);
+               strlcat(options,user_name,options_size);
        }
        if(retry == 0) {
-               if(domain_name) { 
+               if(domain_name) {
                        /* extra length accounted for in option string above */
-                       strncat(options,",domain=",8);
-                       strcat(options,domain_name);
+                       strlcat(options,",domain=",options_size);
+                       strlcat(options,domain_name,options_size);
                }
        }
        if(mountpassword) {
@@ -1160,23 +1338,29 @@ mount_retry:
 /*             if(sep is not set)*/
                if(retry == 0)
                        check_for_comma(&mountpassword);
-               strncat(options,",pass=",6);
-               strcat(options,mountpassword);
+               strlcat(options,",pass=",options_size);
+               strlcat(options,mountpassword,options_size);
        }
 
-       strncat(options,",ver=",5);
-       strcat(options,MOUNT_CIFS_VERSION_MAJOR);
+       strlcat(options,",ver=",options_size);
+       strlcat(options,MOUNT_CIFS_VERSION_MAJOR,options_size);
 
        if(orgoptions) {
-               strcat(options,",");
-               strcat(options,orgoptions);
+               strlcat(options,",",options_size);
+               strlcat(options,orgoptions,options_size);
+       }
+       if(prefixpath) {
+               strlcat(options,",prefixpath=",options_size);
+               strlcat(options,prefixpath,options_size); /* no need to cat the / */
        }
        if(verboseflag)
                printf("\nmount.cifs kernel mount options %s \n",options);
-       if(mount(share_name, mountpoint, "cifs", flags, options)) {
-       /* remember to kill daemon on error */
-               char * tmp;
 
+       /* convert all '\\' to '/' in share portion so that /proc/mounts looks pretty */
+       replace_char(dev_name, '\\', '/', strlen(share_name));
+
+       if(mount(dev_name, mountpoint, "cifs", flags, options)) {
+       /* remember to kill daemon on error */
                switch (errno) {
                case 0:
                        printf("mount failed but no error number set\n");
@@ -1187,55 +1371,49 @@ mount_retry:
                case ENXIO:
                        if(retry == 0) {
                                retry = 1;
-                               tmp = share_name;
-                               while (*tmp && !(((unsigned char)tmp[0]) & 0x80)) {
-                                       *tmp = toupper((unsigned char)*tmp);
-                                       tmp++;
-                               }
-                               if(!*tmp) {
+                               if (uppercase_string(dev_name) &&
+                                   uppercase_string(share_name) &&
+                                   uppercase_string(prefixpath)) {
                                        printf("retrying with upper case share name\n");
                                        goto mount_retry;
                                }
                        }
                default:
-                       
                        printf("mount error %d = %s\n",errno,strerror(errno));
                }
                printf("Refer to the mount.cifs(8) manual page (e.g.man mount.cifs)\n");
-               if(mountpassword) {
-                       memset(mountpassword,0,64);
-               }
-               return -1;
+               rc = -1;
+               goto mount_exit;
        } else {
                pmntfile = setmntent(MOUNTED, "a+");
                if(pmntfile) {
-                       mountent.mnt_fsname = share_name;
-                       mountent.mnt_dir = mountpoint; 
-                       mountent.mnt_type = CONST_DISCARD(char *,"cifs"); 
-                       mountent.mnt_opts = malloc(220);
+                       mountent.mnt_fsname = dev_name;
+                       mountent.mnt_dir = mountpoint;
+                       mountent.mnt_type = CONST_DISCARD(char *,"cifs");
+                       mountent.mnt_opts = (char *)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");
+                                       strlcat(mountent.mnt_opts,"ro",220);
                                else
-                                       strcat(mountent.mnt_opts,"rw");
+                                       strlcat(mountent.mnt_opts,"rw",220);
                                if(flags & MS_MANDLOCK)
-                                       strcat(mountent.mnt_opts,",mand");
+                                       strlcat(mountent.mnt_opts,",mand",220);
                                if(flags & MS_NOEXEC)
-                                       strcat(mountent.mnt_opts,",noexec");
+                                       strlcat(mountent.mnt_opts,",noexec",220);
                                if(flags & MS_NOSUID)
-                                       strcat(mountent.mnt_opts,",nosuid");
+                                       strlcat(mountent.mnt_opts,",nosuid",220);
                                if(flags & MS_NODEV)
-                                       strcat(mountent.mnt_opts,",nodev");
+                                       strlcat(mountent.mnt_opts,",nodev",220);
                                if(flags & MS_SYNCHRONOUS)
-                                       strcat(mountent.mnt_opts,",synch");
+                                       strlcat(mountent.mnt_opts,",synch",220);
                                if(mount_user) {
                                        if(getuid() != 0) {
-                                               strcat(mountent.mnt_opts,",user=");
-                                               strcat(mountent.mnt_opts,mount_user);
+                                               strlcat(mountent.mnt_opts,",user=",220);
+                                               strlcat(mountent.mnt_opts,mount_user,220);
                                        }
-                                       free(mount_user);
+                                       /* free(mount_user); do not free static mem */
                                }
                        }
                        mountent.mnt_freq = 0;
@@ -1248,6 +1426,8 @@ mount_retry:
                    printf("could not update mount table\n");
                }
        }
+       rc = 0;
+mount_exit:
        if(mountpassword) {
                int len = strlen(mountpassword);
                memset(mountpassword,0,len);
@@ -1267,9 +1447,6 @@ mount_retry:
                free(resolved_path);
        }
 
-       if(free_share_name) {
-               free(share_name);
-               }
-       return 0;
+       free(share_name);
+       return rc;
 }
-