X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fmount.c;h=98b94889f872e77ecfa5a4319eb4a729f1480d4f;hb=2d5841133a199619d56d026ad9ea4e97791f4a8f;hp=a379d39e6b330bd425805b7002bace012bd922a1;hpb=9b945cfa781a0f25c3b81239e2fcddceeede6e44;p=libguestfs.git

diff --git a/daemon/mount.c b/daemon/mount.c
index a379d39..98b9488 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -13,7 +13,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -116,13 +116,14 @@ do_mount_vfs (const char *options, const char *vfstype,
     return -1;
   }
 
+  free (error);
   return 0;
 }
 
 int
 do_mount (const char *device, const char *mountpoint)
 {
-  return do_mount_vfs ("sync,noatime", NULL, device, mountpoint);
+  return do_mount_vfs ("", NULL, device, mountpoint);
 }
 
 int
@@ -352,7 +353,7 @@ do_mount_loop (const char *file, const char *mountpoint)
   }
 
   buf = sysroot_path (file);
-  if (!file) {
+  if (!buf) {
     reply_with_perror ("malloc");
     free (mp);
     return -1;
@@ -367,6 +368,7 @@ do_mount_loop (const char *file, const char *mountpoint)
     return -1;
   }
 
+  free (error);
   return 0;
 }