Sync up client/mount.cifs.c with v3-2-test.

Jeremy.
(This used to be commit 7a724d78e11f016f154c0029dc394ce133f41110)

diff --git a/source3/client/mount.cifs.c b/source3/client/mount.cifs.c
index 7432dac5be27cc94a4947170c3f8f23ab7ff1efe..96ab4a8910e4f7521b264e13b13aa1bd79b4b302 100644 (file)
--- a/source3/client/mount.cifs.c
+++ b/source3/client/mount.cifs.c
@@ -160,9 +160,6 @@ static void mount_cifs_usage(void)
        printf("\nTo display the version number of the mount helper:");
        printf("\n\t%s -V\n",thisprogram);
 
-       if(mountpassword) {
-               memset(mountpassword,0,MOUNT_PASSWD_SIZE);
-       }
        SAFE_FREE(mountpassword);
        exit(1);
 }
@@ -222,9 +219,6 @@ static int open_cred_file(char * file_name)
                                if(length > 4086) {
                                        printf("mount.cifs failed due to malformed username in credentials file");
                                        memset(line_buf,0,4096);
-                                       if(mountpassword) {
-                                               memset(mountpassword,0,MOUNT_PASSWD_SIZE);
-                                       }
                                        exit(1);
                                } else {
                                        got_user = 1;
@@ -291,9 +285,6 @@ static int open_cred_file(char * file_name)
 
        }
        fclose(fs);
-       if(line_buf) {
-               memset(line_buf,0,4096);
-       }
        SAFE_FREE(line_buf);
        return 0;
 }
@@ -328,7 +319,6 @@ static int get_password_from_file(int file_descript, char * filename)
                rc = read(file_descript,&c,1);
                if(rc < 0) {
                        printf("mount.cifs failed. Error %s reading password file\n",strerror(errno));
-                       memset(mountpassword,0,MOUNT_PASSWD_SIZE);
                        if(filename != NULL)
                                close(file_descript);
                        exit(1);
@@ -526,7 +516,7 @@ static int parse_options(char ** optionsp, int * filesys_flags)
                                printf("CIFS: invalid domain name\n");
                                return 1;       /* needs_arg; */
                        }
-                       if (strnlen(value, 65) < 65) {
+                       if (strnlen(value, DOMAIN_SIZE+1) < DOMAIN_SIZE+1) {
                                got_domain = 1;
                        } else {
                                printf("domain name too long\n");
@@ -1119,9 +1109,6 @@ int main(int argc, char ** argv)
                        MOUNT_CIFS_VERSION_MAJOR,
                        MOUNT_CIFS_VERSION_MINOR,
                        MOUNT_CIFS_VENDOR_SUFFIX);
-                       if(mountpassword) {
-                               memset(mountpassword,0,MOUNT_PASSWD_SIZE);
-                       }
                        exit (0);
                case 'w':
                        flags &= ~MS_RDONLY;
@@ -1209,7 +1196,7 @@ int main(int argc, char ** argv)
                if(mountpassword == NULL)
                        mountpassword = (char *)calloc(MOUNT_PASSWD_SIZE+1,1);
                if(mountpassword) {
-                       strlcpy(mountpassword,getenv("PASSWD"),MOUNT_PASSWD_SIZE);
+                       strlcpy(mountpassword,getenv("PASSWD"),MOUNT_PASSWD_SIZE+1);
                        got_password = 1;
                }
        } else if (getenv("PASSWD_FD")) {
@@ -1442,16 +1429,8 @@ mount_exit:
                SAFE_FREE(mountpassword);
        }
 
-       if(options) {
-               memset(options,0,optlen);
-               SAFE_FREE(options);
-       }
-
-       if(orgoptions) {
-               memset(orgoptions,0,orgoptlen);
-               SAFE_FREE(orgoptions);
-       }
-
+       SAFE_FREE(options);
+       SAFE_FREE(orgoptions);
        SAFE_FREE(resolved_path);
        SAFE_FREE(share_name);
        return rc;