pkgs/development/libraries/accountsservice/fix-paths.patch

   1 diff --git a/src/daemon.c b/src/daemon.c
   2 index c8b6320..2b74949 100644
   3 --- a/src/daemon.c
   4 +++ b/src/daemon.c
   5 @@ -1102,7 +1102,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 @@ -1335,7 +1335,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";
  23 diff --git a/src/user.c b/src/user.c
  24 index 189b2c5..5358c02 100644
  25 --- a/src/user.c
  26 +++ b/src/user.c
  27 @@ -1145,7 +1145,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 @@ -1218,7 +1218,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 @@ -1627,7 +1627,7 @@ user_change_home_dir_authorized_cb (Daemon                *daemon,
  46                           accounts_user_get_uid (ACCOUNTS_USER (user)),
  47                           home_dir);
  48
  49 -                argv[0] = "/usr/sbin/usermod";
  50 +                argv[0] = "@shadow@/bin/usermod";
  51                  argv[1] = "-m";
  52                  argv[2] = "-d";
  53                  argv[3] = home_dir;
  54 @@ -1683,7 +1683,7 @@ user_change_shell_authorized_cb (Daemon                *daemon,
  55                           accounts_user_get_uid (ACCOUNTS_USER (user)),
  56                           shell);
  57
  58 -                argv[0] = "/usr/sbin/usermod";
  59 +                argv[0] = "@shadow@/bin/usermod";
  60                  argv[1] = "-s";
  61                  argv[2] = shell;
  62                  argv[3] = "--";
  63 @@ -1824,7 +1824,7 @@ user_change_icon_file_authorized_cb (Daemon                *daemon,
  64                          return;
  65                  }
  66
  67 -                argv[0] = "/bin/cat";
  68 +                argv[0] = "@coreutils@/bin/cat";
  69                  argv[1] = filename;
  70                  argv[2] = NULL;
  71
  72 @@ -1904,7 +1904,7 @@ user_change_locked_authorized_cb (Daemon                *daemon,
  73                           locked ? "locking" : "unlocking",
  74                           accounts_user_get_user_name (ACCOUNTS_USER (user)),
  75                           accounts_user_get_uid (ACCOUNTS_USER (user)));
  76 -                argv[0] = "/usr/sbin/usermod";
  77 +                argv[0] = "@shadow@/bin/usermod";
  78                  argv[1] = locked ? "-L" : "-U";
  79                  argv[2] = "--";
  80                  argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
  81 @@ -2026,7 +2026,7 @@ user_change_account_type_authorized_cb (Daemon                *daemon,
  82
  83                  g_free (groups);
  84
  85 -                argv[0] = "/usr/sbin/usermod";
  86 +                argv[0] = "@shadow@/bin/usermod";
  87                  argv[1] = "-G";
  88                  argv[2] = str->str;
  89                  argv[3] = "--";
  90 @@ -2093,7 +2093,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
  91                  if (mode == PASSWORD_MODE_SET_AT_LOGIN ||
  92                      mode == PASSWORD_MODE_NONE) {
  93
  94 -                        argv[0] = "/usr/bin/passwd";
  95 +                        argv[0] = "/run/wrappers/bin/passwd";
  96                          argv[1] = "-d";
  97                          argv[2] = "--";
  98                          argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
  99 @@ -2105,7 +2105,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
 100                          }
 101
 102                          if (mode == PASSWORD_MODE_SET_AT_LOGIN) {
 103 -                                argv[0] = "/usr/bin/chage";
 104 +                                argv[0] = "@shadow@/bin/chage";
 105                                  argv[1] = "-d";
 106                                  argv[2] = "0";
 107                                  argv[3] = "--";
 108 @@ -2126,7 +2126,7 @@ user_change_password_mode_authorized_cb (Daemon                *daemon,
 109                          accounts_user_set_locked (ACCOUNTS_USER (user), FALSE);
 110                  }
 111                  else if (accounts_user_get_locked (ACCOUNTS_USER (user))) {
 112 -                        argv[0] = "/usr/sbin/usermod";
 113 +                        argv[0] = "@shadow@/bin/usermod";
 114                          argv[1] = "-U";
 115                          argv[2] = "--";
 116                          argv[3] = accounts_user_get_user_name (ACCOUNTS_USER (user));
 117 @@ -2203,7 +2203,7 @@ user_change_password_authorized_cb (Daemon                *daemon,
 118
 119          g_object_freeze_notify (G_OBJECT (user));
 120
 121 -        argv[0] = "/usr/sbin/usermod";
 122 +        argv[0] = "@shadow@/bin/usermod";
 123          argv[1] = "-p";
 124          argv[2] = strings[0];
 125          argv[3] = "--";