| 1 | This diff was generated against enlightenment-0.25.0, targeting all the occurances of 'suid_exes'.
|
| 2 |
|
| 3 | diff --git a/src/bin/e_auth.c b/src/bin/e_auth.c
|
| 4 | index 6d07a0ac3..31e0e728f 100644
|
| 5 | |
| 6 | |
| 7 | @@ -38,8 +38,7 @@ e_auth_begin(char *passwd)
|
| 8 | pwlen = strlen(passwd);
|
| 9 |
|
| 10 | snprintf(buf, sizeof(buf),
|
| 11 | - "%s/enlightenment/utils/enlightenment_ckpasswd pw",
|
| 12 | - e_prefix_lib_get());
|
| 13 | + "/run/privileged/bin/enlightenment_ckpasswd pw");
|
| 14 | exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);
|
| 15 | if (!exe) goto out;
|
| 16 | snprintf(buf, sizeof(buf), "pw %s", passwd);
|
| 17 | @@ -75,8 +74,7 @@ e_auth_polkit_begin(char *passwd, const char *cookie, unsigned int uid)
|
| 18 | pwlen = strlen(passwd);
|
| 19 |
|
| 20 | snprintf(buf, sizeof(buf),
|
| 21 | - "%s/enlightenment/utils/enlightenment_ckpasswd pk",
|
| 22 | - e_prefix_lib_get());
|
| 23 | + "/run/privileged/bin/enlightenment_ckpasswd pk");
|
| 24 | exe = ecore_exe_pipe_run(buf, ECORE_EXE_PIPE_WRITE, NULL);
|
| 25 | if (!exe) goto out;
|
| 26 | snprintf(buf, sizeof(buf), "%s %u %s", cookie, uid, passwd);
|
| 27 | diff --git a/src/bin/e_fm/e_fm_main_eeze.c b/src/bin/e_fm/e_fm_main_eeze.c
|
| 28 | index 9b10b3117..74e6b72ad 100644
|
| 29 | |
| 30 | |
| 31 | @@ -318,7 +318,7 @@ _e_fm_main_eeze_volume_eject(E_Volume *v)
|
| 32 | {
|
| 33 | char buf[PATH_MAX];
|
| 34 |
|
| 35 | - snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
|
| 36 | + snprintf(buf, sizeof(buf), "/run/privileged/bin/enlightenment_sys");
|
| 37 | eeze_disk_mount_wrapper_set(v->disk, buf);
|
| 38 | }
|
| 39 | v->guard = ecore_timer_loop_add(E_FM_EJECT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_eject_timeout, v);
|
| 40 | @@ -512,7 +512,7 @@ _e_fm_main_eeze_volume_unmount(E_Volume *v)
|
| 41 | {
|
| 42 | char buf[PATH_MAX];
|
| 43 |
|
| 44 | - snprintf(buf, sizeof(buf), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
|
| 45 | + snprintf(buf, sizeof(buf), "/run/privileged/bin/enlightenment_sys");
|
| 46 | eeze_disk_mount_wrapper_set(v->disk, buf);
|
| 47 | }
|
| 48 | v->guard = ecore_timer_loop_add(E_FM_UNMOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_unmount_timeout, v);
|
| 49 | @@ -548,7 +548,7 @@ _e_fm_main_eeze_volume_mount(E_Volume *v)
|
| 50 | {
|
| 51 | char buf2[PATH_MAX];
|
| 52 |
|
| 53 | - snprintf(buf2, sizeof(buf2), "%s/enlightenment/utils/enlightenment_sys", eina_prefix_lib_get(pfx));
|
| 54 | + snprintf(buf2, sizeof(buf2), "/run/privileged/bin/enlightenment_sys");
|
| 55 | eeze_disk_mount_wrapper_set(v->disk, buf2);
|
| 56 | }
|
| 57 | v->guard = ecore_timer_loop_add(E_FM_MOUNT_TIMEOUT, (Ecore_Task_Cb)_e_fm_main_eeze_vol_mount_timeout, v);
|
| 58 | diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
|
| 59 | index 722063339..2da2d5a23 100644
|
| 60 | |
| 61 | |
| 62 | @@ -596,8 +596,7 @@ main(int argc, char **argv)
|
| 63 | eina_prefix_data_get(pfx));
|
| 64 | putenv(buf2);
|
| 65 | myasprintf(&buf3,
|
| 66 | - "E_ALERT_SYSTEM_BIN=%s/enlightenment/utils/enlightenment_system",
|
| 67 | - eina_prefix_lib_get(pfx));
|
| 68 | + "E_ALERT_SYSTEM_BIN=/run/privileged/bin/enlightenment_system");
|
| 69 | putenv(buf3);
|
| 70 |
|
| 71 | home = getenv("HOME");
|
| 72 | diff --git a/src/bin/e_system.c b/src/bin/e_system.c
|
| 73 | index bfd43e7e2..45d78b7ed 100644
|
| 74 | |
| 75 | |
| 76 | @@ -133,7 +133,7 @@ _system_spawn(void)
|
| 77 | else _respawn_count = 0;
|
| 78 | if (_respawn_count > 5) return;
|
| 79 | snprintf(buf, sizeof(buf),
|
| 80 | - "%s/enlightenment/utils/enlightenment_system", e_prefix_lib_get());
|
| 81 | + "/run/privileged/bin/enlightenment_system");
|
| 82 | _system_exe = ecore_exe_pipe_run
|
| 83 | (buf, ECORE_EXE_NOT_LEADER | ECORE_EXE_TERM_WITH_PARENT |
|
| 84 | ECORE_EXE_PIPE_READ | ECORE_EXE_PIPE_WRITE, NULL);
|