freem/src/fmadm.c - diff

Return to fmadm.c CVS log

Up to [Coherent Logic Development] / freem / src

Diff for /freem/src/fmadm.c between versions 1.23 and 1.24

version 1.23, 2025/04/02 02:16:27	version 1.24, 2025/04/02 03:02:42
Line 24	Line 24
* along with FreeM. If not, see <https://www.gnu.org/licenses/>.	* along with FreeM. If not, see <https://www.gnu.org/licenses/>.
*	*
* $Log$	* $Log$
	* Revision 1.24 2025/04/02 03:02:42 snw
	* Stop requiring users to pass -e to fmadm when -u or -g are passed
	*
* Revision 1.23 2025/04/02 02:16:27 snw	* Revision 1.23 2025/04/02 02:16:27 snw
* Add fmadm status environment command and move journals to a better location	* Add fmadm status environment command and move journals to a better location
*	*
Line 230 int main (int argc, char **argv)	Line 233 int main (int argc, char **argv)
env_user[k++] = argv[i][j];	env_user[k++] = argv[i][j];
}	}

fma_explicit_environment = TRUE;
base_arg++;	base_arg++;

break;	break;
Line 248 int main (int argc, char **argv)	Line 250 int main (int argc, char **argv)
env_group[k++] = argv[i][j];	env_group[k++] = argv[i][j];
}	}

fma_explicit_environment = TRUE;
base_arg++;	base_arg++;

break;	break;
Line 298 int main (int argc, char **argv)	Line 299 int main (int argc, char **argv)
}	}
}	}
}	}

if (obj != OBJ_DAEMON) {	if (obj != OBJ_DAEMON) {
if (strlen (env_user) == 0) {	if (strlen (env_user) == 0) {
snprintf (env_user, 6, "freem");	snprintf (env_user, 6, "freem");
Line 419 int main (int argc, char **argv)	Line 420 int main (int argc, char **argv)
else return fmadm_usage();	else return fmadm_usage();

if (strncmp (obj_str, "lock", STRLEN - 1) == 0) obj = OBJ_LOCK;	if (strncmp (obj_str, "lock", STRLEN - 1) == 0) obj = OBJ_LOCK;
else if (strncmp (obj_str, "zallocate", STRLEN - 1) == 0) obj = OBJ_ZALLOC;
else if (strncmp (obj_str, "journal", STRLEN - 1) == 0) obj = OBJ_JOURNAL;	else if (strncmp (obj_str, "journal", STRLEN - 1) == 0) obj = OBJ_JOURNAL;
else if (strncmp (obj_str, "namespace", STRLEN - 1) == 0) obj = OBJ_NAMESPACE;	else if (strncmp (obj_str, "namespace", STRLEN - 1) == 0) obj = OBJ_NAMESPACE;
else if (strncmp (obj_str, "global", STRLEN - 1) == 0) obj = OBJ_GLOBAL;	else if (strncmp (obj_str, "global", STRLEN - 1) == 0) obj = OBJ_GLOBAL;
Line 677 int fm_shell (void)	Line 677 int fm_shell (void)
strcpy (obj_str, args[0]);	strcpy (obj_str, args[0]);

if (strncmp (obj_str, "lock", STRLEN - 1) == 0) obj = OBJ_LOCK;	if (strncmp (obj_str, "lock", STRLEN - 1) == 0) obj = OBJ_LOCK;
else if (strncmp (obj_str, "zallocate", STRLEN - 1) == 0) obj = OBJ_ZALLOC;
else if (strncmp (obj_str, "journal", STRLEN - 1) == 0) obj = OBJ_JOURNAL;	else if (strncmp (obj_str, "journal", STRLEN - 1) == 0) obj = OBJ_JOURNAL;
else if (strncmp (obj_str, "namespace", STRLEN - 1) == 0) obj = OBJ_NAMESPACE;	else if (strncmp (obj_str, "namespace", STRLEN - 1) == 0) obj = OBJ_NAMESPACE;
else if (strncmp (obj_str, "global", STRLEN - 1) == 0) obj = OBJ_GLOBAL;	else if (strncmp (obj_str, "global", STRLEN - 1) == 0) obj = OBJ_GLOBAL;
Line 881 int fmadm_usage (void)	Line 880 int fmadm_usage (void)
fprintf (stdout, " stop, restart\n\n");	fprintf (stdout, " stop, restart\n\n");

fprintf (stdout, " <object> can be one of:\n");	fprintf (stdout, " <object> can be one of:\n");
fprintf (stdout, " lock, zallocate, journal, namespace, global, routine, job,\n");	fprintf (stdout, " lock, journal, namespace, global, routine, job,\n");
fprintf (stdout, " environment\n\n");	fprintf (stdout, " environment\n\n");

fprintf (stdout, " Not all actions are valid for all objects. Please see the FreeM manual\n");	fprintf (stdout, " Not all actions are valid for all objects. Please see the FreeM manual\n");
Line 1338 void fm_configure (void)	Line 1337 void fm_configure (void)
char usrrtn[4096];	char usrrtn[4096];
char usrgbl[4096];	char usrgbl[4096];

char locktab[4096];
char zalloctab[4096];
char jnldir[4096];	char jnldir[4096];
char jnlfile[4096];	char jnlfile[4096];
char jnlmode[4];	char jnlmode[4];
Line 1367 void fm_configure (void)	Line 1364 void fm_configure (void)
char *groupname = env_group;	char *groupname = env_group;

#if !defined(__OS2__)	#if !defined(__OS2__)
	if (geteuid () != 0) {
	fprintf (stderr, "fmadm: not superuser\n");
	exit (1);
	}

struct group *d_grp;	struct group *d_grp;
struct passwd *d_user;	struct passwd *d_user;
gid_t d_gid;	gid_t d_gid;
Line 1391 void fm_configure (void)	Line 1393 void fm_configure (void)
snprintf (sysgbl, 4095, "%s/freem/%s/SYSTEM/globals", LOCALSTATEDIR, fma_environment);	snprintf (sysgbl, 4095, "%s/freem/%s/SYSTEM/globals", LOCALSTATEDIR, fma_environment);
snprintf (usrrtn, 4095, "%s/freem/%s/USER/routines", LOCALSTATEDIR, fma_environment);	snprintf (usrrtn, 4095, "%s/freem/%s/USER/routines", LOCALSTATEDIR, fma_environment);
snprintf (usrgbl, 4095, "%s/freem/%s/USER/globals", LOCALSTATEDIR, fma_environment);	snprintf (usrgbl, 4095, "%s/freem/%s/USER/globals", LOCALSTATEDIR, fma_environment);
snprintf (locktab, 4095, "/tmp/locktab");
snprintf (zalloctab, 4095, "/tmp/zalloctab");
snprintf (jnldir, 4095, "%s/freem/%s/journals", LOCALSTATEDIR, fma_environment);	snprintf (jnldir, 4095, "%s/freem/%s/journals", LOCALSTATEDIR, fma_environment);
snprintf (jnlfile, 4095, "%s/freem_journal_%s.dat", jnldir, fma_environment);	snprintf (jnlfile, 4095, "%s/freem_journal_%s.dat", jnldir, fma_environment);
snprintf (jnlmode, 3, "on");	snprintf (jnlmode, 3, "on");

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.23
changed lines
	Added in v.1.24