Changeset 134 for branches/samba-3.0/source/client/mount.cifs.c

Timestamp:

May 23, 2008, 6:56:41 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to 3.0.29

File:

• branches/samba-3.0/source/client/mount.cifs.c (modified) (10 diffs)

branches/samba-3.0/source/client/mount.cifs.c

@@ -1 +1 @@
 /* 
    Mount helper utility for Linux CIFS VFS (virtual filesystem) client
-   Copyright (C) 2003,2005 Steve French  (sfrench@us.ibm.com)
+   Copyright (C) 2003,2008 Steve French  (sfrench@us.ibm.com)
 
    This program is free software; you can redistribute it and/or modify
@@ -39 +39 @@
 #include <mntent.h>
 #include <fcntl.h>
+#include <limits.h>
 
 #define MOUNT_CIFS_VERSION_MAJOR "1"
@@ -153 +154 @@
                 memset(mountpassword,0,64);
                 free(mountpassword);
+                mountpassword = NULL;
         }
         exit(1);
@@ -290 +292 @@
                 memset(line_buf,0,4096);
                 free(line_buf);
+                line_buf = NULL;
         }
         return 0;
@@ -1226 +1229 @@
        
         if(got_password == 0) {
-                mountpassword = getpass("Password: "); /* BB obsolete */
+                char *tmp_pass;
+                tmp_pass = getpass("Password: "); /* BB obsolete sys call but
+                                                     no good replacement yet */
+                mountpassword = (char *)calloc(65,1);
+                if (!tmp_pass || !mountpassword) {
+                        printf("Password not entered, exiting.\n");
+                        return -1;
+                }
+                strncpy(mountpassword, tmp_pass, 64);
+                                                 
                 got_password = 1;
         }
@@ -1250 +1262 @@
         if(mountpassword)
                 optlen += strlen(mountpassword) + 6;
-        if(options)
+        if(options) {
                 free(options);
+                options = NULL;
+        }
         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 */);
@@ -1375 +1389 @@
                         rc = addmntent(pmntfile,&mountent);
                         endmntent(pmntfile);
-                        if(mountent.mnt_opts)
+                        if(mountent.mnt_opts) {
                                 free(mountent.mnt_opts);
+                                mountent.mnt_opts = NULL;
+                        }
                 } else {
                     printf("could not update mount table\n");
@@ -1387 +1403 @@
                 memset(mountpassword,0,len);
                 free(mountpassword);
+                mountpassword = NULL;
         }
 
@@ -1392 +1409 @@
                 memset(options,0,optlen);
                 free(options);
+                options = NULL;
         }
 
@@ -1397 +1415 @@
                 memset(orgoptions,0,orgoptlen);
                 free(orgoptions);
+                orgoptions = NULL;
         }
         if(resolved_path) {
                 free(resolved_path);
+                resolved_path = NULL;
         }
 
         if(free_share_name) {
                 free(share_name);
+                share_name = NULL;
                 }
         return rc;