Changeset 165 for branches/samba-3.0/source/client/umount.cifs.c

Timestamp:

Mar 11, 2009, 9:14:55 AM (16 years ago)

Author:

Paul Smedley

Message:

Add 'missing' 3.0.34 diffs

File:

• branches/samba-3.0/source/client/umount.cifs.c (modified) (3 diffs)

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

@@ -35 +35 @@
 #include <string.h>
 #include <mntent.h>
+#include "mount.h"
 
 #define UNMOUNT_CIFS_VERSION_MAJOR "0"
-#define UNMOUNT_CIFS_VERSION_MINOR "5"
+#define UNMOUNT_CIFS_VERSION_MINOR "6"
 
 #ifndef UNMOUNT_CIFS_VENDOR_SUFFIX
@@ -139 +140 @@
 }
 
-static int lock_mtab(void)
-{
-        int rc;
-        
-        rc = mknod(MOUNTED_LOCK , 0600, 0);
-        if(rc == -1)
-                printf("\ngetting lock file %s failed with %s\n",MOUNTED_LOCK,
-                                strerror(errno));
-                
-        return rc;      
-        
-}
-
-static void unlock_mtab(void)
-{
-        unlink(MOUNTED_LOCK);   
-}
-
 static int remove_from_mtab(char * mountpoint)
 {
@@ -170 +153 @@
         /* Do we first need to check if it is writable? */ 
 
+        atexit(unlock_mtab);
         if (lock_mtab()) {
                 printf("Mount table locked\n");