diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch | 66 |
1 files changed, 42 insertions, 24 deletions
diff --git a/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch b/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch index 0ed8e04579f4..d4b48e882e53 100644 --- a/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch +++ b/nixpkgs/pkgs/development/libraries/accountsservice/fix-paths.patch @@ -1,8 +1,8 @@ diff --git a/src/daemon.c b/src/daemon.c -index c8b6320..2b74949 100644 +index aa9d050..861430f 100644 --- a/src/daemon.c +++ b/src/daemon.c -@@ -1102,7 +1102,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, +@@ -1319,7 +1319,7 @@ daemon_create_user_authorized_cb (Daemon *daemon, sys_log (context, "create user '%s'", cd->user_name); @@ -11,7 +11,7 @@ index c8b6320..2b74949 100644 argv[1] = "-m"; argv[2] = "-c"; argv[3] = cd->real_name; -@@ -1335,7 +1335,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, +@@ -1552,7 +1552,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon, } free (resolved_homedir); @@ -21,10 +21,10 @@ index c8b6320..2b74949 100644 argv[1] = "-f"; argv[2] = "-r"; diff --git a/src/user.c b/src/user.c -index 189b2c5..5358c02 100644 +index 917d427..28170db 100644 --- a/src/user.c +++ b/src/user.c -@@ -1145,7 +1145,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, +@@ -1193,7 +1193,7 @@ user_change_real_name_authorized_cb (Daemon *daemon, new_gecos = g_strdup (name); } @@ -33,7 +33,7 @@ index 189b2c5..5358c02 100644 argv[1] = "-c"; argv[2] = new_gecos; argv[3] = "--"; -@@ -1218,7 +1218,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, +@@ -1267,7 +1267,7 @@ user_change_user_name_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), name); @@ -42,7 +42,25 @@ index 189b2c5..5358c02 100644 argv[1] = "-l"; argv[2] = name; argv[3] = "--"; -@@ -1627,7 +1627,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, +@@ -1718,7 +1718,7 @@ user_set_password_expiration_policy_authorized_cb (Daemon *daemon + accounts_user_get_uid (ACCOUNTS_USER (user))); + + g_object_freeze_notify (G_OBJECT (user)); +- argv[0] = "/usr/bin/chage"; ++ argv[0] = "@shadow@/bin/chage"; + argv[1] = "-m"; + argv[2] = pwd_expiration->min_days_between_changes; + argv[3] = "-M"; +@@ -1806,7 +1806,7 @@ user_set_user_expiration_policy_authorized_cb (Daemon *daemon, + } else { + expiration_time = g_strdup ("-1"); + } +- argv[0] = "/usr/bin/chage"; ++ argv[0] = "@shadow@/bin/chage"; + argv[1] = "-E"; + argv[2] = expiration_time; + argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); +@@ -1919,7 +1919,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), home_dir); @@ -51,7 +69,7 @@ index 189b2c5..5358c02 100644 argv[1] = "-m"; argv[2] = "-d"; argv[3] = home_dir; -@@ -1683,7 +1683,7 @@ user_change_shell_authorized_cb (Daemon *daemon, +@@ -1977,7 +1977,7 @@ user_change_shell_authorized_cb (Daemon *daemon, accounts_user_get_uid (ACCOUNTS_USER (user)), shell); @@ -60,7 +78,7 @@ index 189b2c5..5358c02 100644 argv[1] = "-s"; argv[2] = shell; argv[3] = "--"; -@@ -1824,7 +1824,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, +@@ -2120,7 +2120,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon, return; } @@ -69,7 +87,7 @@ index 189b2c5..5358c02 100644 argv[1] = filename; argv[2] = NULL; -@@ -1904,7 +1904,7 @@ user_change_locked_authorized_cb (Daemon *daemon, +@@ -2201,7 +2201,7 @@ user_change_locked_authorized_cb (Daemon *daemon, locked ? "locking" : "unlocking", accounts_user_get_user_name (ACCOUNTS_USER (user)), accounts_user_get_uid (ACCOUNTS_USER (user))); @@ -78,7 +96,7 @@ index 189b2c5..5358c02 100644 argv[1] = locked ? "-L" : "-U"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -2026,7 +2026,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, +@@ -2328,7 +2328,7 @@ user_change_account_type_authorized_cb (Daemon *daemon, g_free (groups); @@ -87,16 +105,16 @@ index 189b2c5..5358c02 100644 argv[1] = "-G"; argv[2] = str->str; argv[3] = "--"; -@@ -2093,7 +2093,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2396,7 +2396,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, + if (mode == PASSWORD_MODE_SET_AT_LOGIN || mode == PASSWORD_MODE_NONE) { - - argv[0] = "/usr/bin/passwd"; + argv[0] = "/run/wrappers/bin/passwd"; argv[1] = "-d"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -2105,7 +2105,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2408,7 +2408,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, } if (mode == PASSWORD_MODE_SET_AT_LOGIN) { @@ -105,21 +123,21 @@ index 189b2c5..5358c02 100644 argv[1] = "-d"; argv[2] = "0"; argv[3] = "--"; -@@ -2126,7 +2126,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, +@@ -2428,7 +2428,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon, + */ accounts_user_set_locked (ACCOUNTS_USER (user), FALSE); - } - else if (accounts_user_get_locked (ACCOUNTS_USER (user))) { + } else if (accounts_user_get_locked (ACCOUNTS_USER (user))) { - argv[0] = "/usr/sbin/usermod"; + argv[0] = "@shadow@/bin/usermod"; argv[1] = "-U"; argv[2] = "--"; argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user)); -@@ -2203,7 +2203,7 @@ user_change_password_authorized_cb (Daemon *daemon, +@@ -2505,7 +2505,7 @@ user_change_password_authorized_cb (Daemon *daemon, - g_object_freeze_notify (G_OBJECT (user)); + g_autoptr (GError) error = NULL; + g_autoptr (GSubprocess) process = NULL; +- const char *argv[] = { "/usr/sbin/chpasswd", "-e", NULL }; ++ const char *argv[] = { "@shadow@/bin/chpasswd", "-e", NULL }; -- argv[0] = "/usr/sbin/usermod"; -+ argv[0] = "@shadow@/bin/usermod"; - argv[1] = "-p"; - argv[2] = strings[0]; - argv[3] = "--"; + sys_log (context, + "set password and hint of user '%s' (%" G_GUINT64_FORMAT ")", |