Changeset 228 for branches/samba-3.2.x/source/client/umount.cifs.c

Timestamp:

May 26, 2009, 9:44:50 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.6

File:

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

branches/samba-3.2.x/source/client/umount.cifs.c

@@ -34 +34 @@
 #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
@@ -138 +139 @@
 }
 
-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)
 {
@@ -169 +152 @@
         /* Do we first need to check if it is writable? */ 
 
+        atexit(unlock_mtab);
         if (lock_mtab()) {
                 printf("Mount table locked\n");