luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-01 05:13:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'drop-pamconsole' into 'main'

Browse Source 
gunixmounts: Drop references to pamconsole mount option

See merge request GNOME/glib!2306
This commit is contained in:
Philip Withnall 2021-10-21 11:49:06 +00:00
commit 2602e0f1aa
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gunixmounts.c
View File

@ -1062,7 +1062,6 @@ _g_get_unix_mount_points (void)
if ((mount_fstype != NULL && g_strcmp0 ("supermount", mount_fstype) == 0) || if ((mount_fstype != NULL && g_strcmp0 ("supermount", mount_fstype) == 0) ||
((userspace_flags & MNT_MS_USER) && ((userspace_flags & MNT_MS_USER) &&
(g_strstr_len (mount_options, -1, "user_xattr") == NULL)) || (g_strstr_len (mount_options, -1, "user_xattr") == NULL)) ||
(g_strstr_len (mount_options, -1, "pamconsole") == NULL) ||
(userspace_flags & MNT_MS_USERS) || (userspace_flags & MNT_MS_USERS) ||
(userspace_flags & MNT_MS_OWNER)) (userspace_flags & MNT_MS_OWNER))
{ {
@ -1158,7 +1157,6 @@ _g_get_unix_mount_points (void)
#ifdef HAVE_HASMNTOPT #ifdef HAVE_HASMNTOPT
|| (hasmntopt (mntent, "user") != NULL || (hasmntopt (mntent, "user") != NULL
&& hasmntopt (mntent, "user") != hasmntopt (mntent, "user_xattr")) && hasmntopt (mntent, "user") != hasmntopt (mntent, "user_xattr"))
|| hasmntopt (mntent, "pamconsole") != NULL
|| hasmntopt (mntent, "users") != NULL || hasmntopt (mntent, "users") != NULL
|| hasmntopt (mntent, "owner") != NULL || hasmntopt (mntent, "owner") != NULL
#endif #endif
@ -1231,7 +1229,6 @@ _g_get_unix_mount_points (void)
#ifdef HAVE_HASMNTOPT #ifdef HAVE_HASMNTOPT
|| (hasmntopt (&mntent, "user") != NULL || (hasmntopt (&mntent, "user") != NULL
&& hasmntopt (&mntent, "user") != hasmntopt (&mntent, "user_xattr")) && hasmntopt (&mntent, "user") != hasmntopt (&mntent, "user_xattr"))
|| hasmntopt (&mntent, "pamconsole") != NULL
|| hasmntopt (&mntent, "users") != NULL || hasmntopt (&mntent, "users") != NULL
|| hasmntopt (&mntent, "owner") != NULL || hasmntopt (&mntent, "owner") != NULL
#endif #endif