Attachment 290166 Details for Bug 426320 – Fix directory ownership (improved)

[patch] Fix directory ownership (improved)

fix_dir_ownership.patch (text/plain), 2.03 KB, created by Nathaniel McCallum on 2007-12-20 16:27:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathaniel McCallum

Created: 2007-12-20 16:27:38 UTC

Size: 2.03 KB

patch

obsolete

>diff -Nru hal-0.5.10.orig/tools/hal-storage-mount.c hal-0.5.10/tools/hal-storage-mount.c
>--- hal-0.5.10.orig/tools/hal-storage-mount.c	2007-08-27 13:22:46.000000000 -0400
>+++ hal-0.5.10/tools/hal-storage-mount.c	2007-12-20 11:16:31.000000000 -0500
>@@ -37,7 +37,6 @@
> #include <sys/ucred.h>
> #include <sys/mount.h>
> #include <limits.h>
>-#include <pwd.h>
> #elif sun
> #include <sys/mnttab.h>
> #include <sys/vfstab.h>
>@@ -45,6 +44,7 @@
> #include <mntent.h>
> #endif
> #include <sys/types.h>
>+#include <pwd.h>
> #include <unistd.h>
> #include <errno.h>
> #include <syslog.h>
>@@ -466,11 +466,9 @@
> 	gboolean is_remount;
> 	gboolean explicit_mount_point_given;
> 	const char *end;
>-#ifdef __FreeBSD__
> 	struct passwd *pw;
> 	uid_t calling_uid;
> 	gid_t calling_gid;
>-#endif
> 	const char *label;
> 	const char *uuid;
> 
>@@ -824,22 +822,6 @@
> 			printf ("Cannot create '%s'\n", mount_dir);
> 			unknown_error ("Cannot create mount directory");
> 		}
>-		
>-#ifdef __FreeBSD__
>-		calling_uid = (uid_t) strtol (invoked_by_uid, (char **) NULL, 10);
>-		pw = getpwuid (calling_uid);
>-		if (pw != NULL) {
>-			calling_gid = pw->pw_gid;
>-		} else {
>-			calling_gid = 0;
>-		}
>-		if (chown (mount_dir, calling_uid, calling_gid) != 0) {
>-			printf ("Cannot chown '%s' to uid: %d, gid: %d\n", mount_dir,
>-				calling_uid, calling_gid);
>-			g_rmdir (mount_dir);
>-			unknown_error ("Failed to chown mount directory");
>-		}
>-#endif
> 	}
> 
> 
>@@ -933,6 +915,19 @@
> 		unknown_error ("Cannot spawn " MOUNT);
> 	}
> 
>+	/* Make sure this mount point is owned by the person who asked to mount it */
>+	calling_uid = (uid_t) strtol (invoked_by_uid, (char **) NULL, 10);
>+	pw = getpwuid (calling_uid);
>+	if (pw != NULL) {
>+		calling_gid = pw->pw_gid;
>+	} else {
>+		calling_gid = -1; /* If group is not found, don't change it */
>+	}
>+	if (chown (mount_dir, calling_uid, calling_gid) != 0) {
>+		printf ("Cannot chown '%s' to uid: %d, gid: %d\n", mount_dir,
>+			calling_uid, calling_gid);
>+		/* Don't generate an error here, just a warning... */
>+	}
> 
> 	if (exit_status != 0) {
> 		char errstr[]  = "mount: unknown filesystem type";

Actions: View | Diff

Attachments on bug 426320: 290086 | 290166