tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/src/daemon.c b/src/daemon.c
2index aa9d050..861430f 100644
3--- a/src/daemon.c
4+++ b/src/daemon.c
5@@ -1319,7 +1319,7 @@ daemon_create_user_authorized_cb (Daemon *daemon,
6
7 sys_log (context, "create user '%s'", cd->user_name);
8
9- argv[0] = "/usr/sbin/useradd";
10+ argv[0] = "@shadow@/bin/useradd";
11 argv[1] = "-m";
12 argv[2] = "-c";
13 argv[3] = cd->real_name;
14@@ -1552,7 +1552,7 @@ daemon_delete_user_authorized_cb (Daemon *daemon,
15 }
16 free (resolved_homedir);
17
18- argv[0] = "/usr/sbin/userdel";
19+ argv[0] = "@shadow@/bin/userdel";
20 if (ud->remove_files) {
21 argv[1] = "-f";
22 argv[2] = "-r";
23diff --git a/src/user.c b/src/user.c
24index 917d427..28170db 100644
25--- a/src/user.c
26+++ b/src/user.c
27@@ -1193,7 +1193,7 @@ user_change_real_name_authorized_cb (Daemon *daemon,
28 new_gecos = g_strdup (name);
29 }
30
31- argv[0] = "/usr/sbin/usermod";
32+ argv[0] = "@shadow@/bin/usermod";
33 argv[1] = "-c";
34 argv[2] = new_gecos;
35 argv[3] = "--";
36@@ -1267,7 +1267,7 @@ user_change_user_name_authorized_cb (Daemon *daemon,
37 accounts_user_get_uid (ACCOUNTS_USER (user)),
38 name);
39
40- argv[0] = "/usr/sbin/usermod";
41+ argv[0] = "@shadow@/bin/usermod";
42 argv[1] = "-l";
43 argv[2] = name;
44 argv[3] = "--";
45@@ -1718,7 +1718,7 @@ user_set_password_expiration_policy_authorized_cb (Daemon *daemon
46 accounts_user_get_uid (ACCOUNTS_USER (user)));
47
48 g_object_freeze_notify (G_OBJECT (user));
49- argv[0] = "/usr/bin/chage";
50+ argv[0] = "@shadow@/bin/chage";
51 argv[1] = "-m";
52 argv[2] = pwd_expiration->min_days_between_changes;
53 argv[3] = "-M";
54@@ -1806,7 +1806,7 @@ user_set_user_expiration_policy_authorized_cb (Daemon *daemon,
55 } else {
56 expiration_time = g_strdup ("-1");
57 }
58- argv[0] = "/usr/bin/chage";
59+ argv[0] = "@shadow@/bin/chage";
60 argv[1] = "-E";
61 argv[2] = expiration_time;
62 argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
63@@ -1919,7 +1919,7 @@ user_change_home_dir_authorized_cb (Daemon *daemon,
64 accounts_user_get_uid (ACCOUNTS_USER (user)),
65 home_dir);
66
67- argv[0] = "/usr/sbin/usermod";
68+ argv[0] = "@shadow@/bin/usermod";
69 argv[1] = "-m";
70 argv[2] = "-d";
71 argv[3] = home_dir;
72@@ -1977,7 +1977,7 @@ user_change_shell_authorized_cb (Daemon *daemon,
73 accounts_user_get_uid (ACCOUNTS_USER (user)),
74 shell);
75
76- argv[0] = "/usr/sbin/usermod";
77+ argv[0] = "@shadow@/bin/usermod";
78 argv[1] = "-s";
79 argv[2] = shell;
80 argv[3] = "--";
81@@ -2120,7 +2120,7 @@ user_change_icon_file_authorized_cb (Daemon *daemon,
82 return;
83 }
84
85- argv[0] = "/bin/cat";
86+ argv[0] = "@coreutils@/bin/cat";
87 argv[1] = filename;
88 argv[2] = NULL;
89
90@@ -2201,7 +2201,7 @@ user_change_locked_authorized_cb (Daemon *daemon,
91 locked ? "locking" : "unlocking",
92 accounts_user_get_user_name (ACCOUNTS_USER (user)),
93 accounts_user_get_uid (ACCOUNTS_USER (user)));
94- argv[0] = "/usr/sbin/usermod";
95+ argv[0] = "@shadow@/bin/usermod";
96 argv[1] = locked ? "-L" : "-U";
97 argv[2] = "--";
98 argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
99@@ -2328,7 +2328,7 @@ user_change_account_type_authorized_cb (Daemon *daemon,
100
101 g_free (groups);
102
103- argv[0] = "/usr/sbin/usermod";
104+ argv[0] = "@shadow@/bin/usermod";
105 argv[1] = "-G";
106 argv[2] = str->str;
107 argv[3] = "--";
108@@ -2396,7 +2396,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
109
110 if (mode == PASSWORD_MODE_SET_AT_LOGIN ||
111 mode == PASSWORD_MODE_NONE) {
112- argv[0] = "/usr/bin/passwd";
113+ argv[0] = "/run/wrappers/bin/passwd";
114 argv[1] = "-d";
115 argv[2] = "--";
116 argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
117@@ -2408,7 +2408,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
118 }
119
120 if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
121- argv[0] = "/usr/bin/chage";
122+ argv[0] = "@shadow@/bin/chage";
123 argv[1] = "-d";
124 argv[2] = "0";
125 argv[3] = "--";
126@@ -2428,7 +2428,7 @@ user_change_password_mode_authorized_cb (Daemon *daemon,
127 */
128 accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
129 } else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
130- argv[0] = "/usr/sbin/usermod";
131+ argv[0] = "@shadow@/bin/usermod";
132 argv[1] = "-U";
133 argv[2] = "--";
134 argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
135@@ -2505,7 +2505,7 @@ user_change_password_authorized_cb (Daemon *daemon,
136
137 g_autoptr (GError) error = NULL;
138 g_autoptr (GSubprocess) process = NULL;
139- const char *argv[] = { "/usr/sbin/chpasswd", "-e", NULL };
140+ const char *argv[] = { "@shadow@/bin/chpasswd", "-e", NULL };
141
142 sys_log (context,
143 "set password and hint of user '%s' (%" G_GUINT64_FORMAT ")",