--- freem/src/fmadm.c 2025/04/03 20:48:14 1.30 +++ freem/src/fmadm.c 2025/04/04 19:43:18 1.31 @@ -1,5 +1,5 @@ /* - * $Id: fmadm.c,v 1.30 2025/04/03 20:48:14 snw Exp $ + * $Id: fmadm.c,v 1.31 2025/04/04 19:43:18 snw Exp $ * FreeM Administration Tool * * @@ -24,6 +24,9 @@ * along with FreeM. If not, see . * * $Log: fmadm.c,v $ + * Revision 1.31 2025/04/04 19:43:18 snw + * Switch to using environment catalog to determine user and group for environment, and remove -u and -g flags from freem + * * Revision 1.30 2025/04/03 20:48:14 snw * Improve daemon error diagnostics and bump to 0.63.0-rc3 * @@ -1213,7 +1216,7 @@ int fm_validate_environment (char *env) return FALSE; } -int fm_start_environment (char *env, char *e_user, char *e_grp) +int fm_start_environment (char *env) { char basecmd[255]; char cmd[4096]; @@ -1229,9 +1232,9 @@ int fm_start_environment (char *env, cha #endif #if !defined(__OS2__) - snprintf (cmd, 4095, "%s -d -e %s -u %s -g %s", basecmd, env, e_user, e_grp); + snprintf (cmd, 4095, "%s -d -e %s", basecmd, env); #else - sprintf (cmd, 4095, "%s -d -k -e %s -u %s -g %s", basecmd, env, e_user, e_grp); + sprintf (cmd, 4095, "%s -d -k -e %s", basecmd, env); #endif system (cmd); @@ -1389,7 +1392,7 @@ int fm_daemonctl (short action, short ob switch (action) { case ACT_START: - result = fm_start_environment (cur_env, e_user, e_grp); + result = fm_start_environment (cur_env); if (result == TRUE) { fprintf (stderr, "[OK]\n"); } @@ -1411,7 +1414,7 @@ int fm_daemonctl (short action, short ob case ACT_RESTART: if (fm_stop_environment (cur_env) == TRUE) { - result = fm_start_environment (cur_env, e_user, e_grp); + result = fm_start_environment (cur_env); if (result == TRUE) { fprintf (stderr, "[OK]\n"); }