Bug#383929: [Patch] Re: pmount: pumount fails if /media is a symlink

[Tim Phipps]

You can work around this with "mount --bind /var/media /media" or this
patch will make pumount use the real path of /media for the mount point
check.

Cheers,
Tim.


--- pmount-0.9.13.orig/src/pumount.c    2006-08-29 14:20:05.000000000 +0100
+++ pmount-0.9.13/src/pumount.c 2006-08-29 15:04:08.000000000 +0100
@@ -62,6 +62,7 @@
 check_umount_policy( const char* device, int do_lazy ) 
 {
     int devvalid;
+    char mediadir[PATH_MAX];
 
     devvalid = ( do_lazy || device_valid( device ) ) &&
         device_mounted( device, 1, mntpt );
@@ -75,8 +76,15 @@
         exit( E_INTERNAL );
     }
 
+    /* MEDIADIR may be a symlink (for read-only root systems) */
+    if( NULL == realpath( MEDIADIR, mediadir ) ) {
+        fprintf( stderr, _("Error: could not find real path of %s\n"),
+                MEDIADIR );
+        exit( E_INTERNAL );
+    }
+
     /* mount point must be below MEDIADIR */
-    if( strncmp( mntpt, MEDIADIR, sizeof( MEDIADIR )-1 ) ) {
+    if( strncmp( mntpt, mediadir, strlen( mediadir ) ) ) {
         fprintf( stderr, _("Error: mount point %s is not below %s\n"), mntpt,
                 MEDIADIR );
         return -1;