Move the setuid call after mlockall, since the latter requires elevated
privileges, and will cause iscsid startup to fail when an unprivileged
uid is specified.
Signed-off-by: Anthony Iliopoulos <
ail...@suse.com>
---
usr/iscsid.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/usr/iscsid.c b/usr/iscsid.c
index e50149823bee..9f1a09fe28f2 100644
--- a/usr/iscsid.c
+++ b/usr/iscsid.c
@@ -525,12 +525,6 @@ int main(int argc, char *argv[])
}
}
- if (uid && setuid(uid) < 0) {
- log_error("Unable to setuid to %d", uid);
- log_close(log_pid);
- exit(ISCSI_ERR);
- }
-
memset(&daemon_config, 0, sizeof (daemon_config));
daemon_config.pid_file = pid_file;
daemon_config.config_file = config_file;
@@ -601,6 +595,12 @@ int main(int argc, char *argv[])
exit(ISCSI_ERR);
}
+ if (uid && setuid(uid) < 0) {
+ log_error("Unable to setuid to %d", uid);
+ log_close(log_pid);
+ exit(ISCSI_ERR);
+ }
+
set_state_to_ready();
event_loop(ipc, control_fd, mgmt_ipc_fd);
--
2.29.0