--- embedtools/src/cfexec.c	2018/01/01 23:52:54	1.5.20.7
+++ embedtools/src/cfexec.c	2021/03/21 01:30:19	1.5.20.10
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@aitbg.com>
  *
  * $Author: misho $
- * $Id: cfexec.c,v 1.5.20.7 2018/01/01 23:52:54 misho Exp $
+ * $Id: cfexec.c,v 1.5.20.10 2021/03/21 01:30:19 misho Exp $
  *
  *************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2018
+Copyright 2004 - 2021
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -61,6 +61,7 @@ Usage()
 		"=== %s === %s@%s ===\n\n"
 		"  Syntax: cfexec [options] [exec_file]\n\n"
 		"\t-v\t\tVerbose ...\n"
+		"\t-C <config>\tLoad config [default=/etc/cfexec.conf]\n"
 		"\t-c <dir>\tAfter execute chroot to dir [default=/]\n"
 		"\t-u <user>\tAfter execute suid to user [default=root]\n"
 		"\t-m <mnt>\tOther mount dir [default=/]\n"
@@ -89,18 +90,40 @@ getmntpt(const char *name)
 static int
 update(int flags)
 {
-	struct ufs_args mnt;
 	struct statfs *mntfs = getmntpt(AIT_GET_STR(&Mount));
+	char errmsg[STRSIZ] = { [0 ... STRSIZ - 1] = 0 };
 
+#ifdef __NetBSD__
+	struct ufs_args mnt;
+
 	memset(&mnt, 0, sizeof mnt);
 	mnt.fspec = mntfs->f_mntfromname;
-#ifdef __NetBSD__
 	if (mount(mntfs->f_fstypename, mntfs->f_mntonname, flags, &mnt, sizeof mnt) == -1) {
 #else
-	if (mount(mntfs->f_fstypename, mntfs->f_mntonname, flags, &mnt) == -1) {
+	iovec_t *iov;
+	int ret;
+
+	iov = iov_Init();
+	if (!iov)
+		return -1;
+	if (flags & MNT_RDONLY)
+		iov_PushPair(iov, "ro", "", 0);
+	else
+		iov_PushPair(iov, "noro", "", 0);
+	iov_PushPair(iov, "update", "", 0);
+	iov_PushPair(iov, "fstype", mntfs->f_fstypename, (size_t) -1);
+	iov_PushPair(iov, "fspath", mntfs->f_mntonname, (size_t) -1);
+	iov_PushPair(iov, "from", mntfs->f_mntfromname, (size_t) -1);
+	iov_PushPair(iov, "errmsg", errmsg, sizeof errmsg);
+
+	ret = nmount(iov_Array(iov), iov_Size(iov), flags);
+
+	iov_FreePairs(iov, 0);
+	iov_Destroy(&iov);
+	if (ret  == -1) {
 #endif
-		printf("Error:: can`t update mount %s #%d - %s\n", AIT_GET_STR(&Mount), 
-				errno, strerror(errno));
+		printf("Error:: can`t update mount %s %s #%d - %s\n", AIT_GET_STR(&Mount), 
+				errmsg, errno, strerror(errno));
 		return -1;
 	}
 
@@ -168,8 +191,6 @@ cleanexit()
 	AIT_FREE_VAL(&User);
 	AIT_FREE_VAL(&Mount);
 	AIT_FREE_VAL(&Chroot);
-
-	cfgUnloadConfig(&cfg);
 }
 
 static int
@@ -258,8 +279,29 @@ main(int argc, char **argv)
 	atexit(cleanexit);
 
 	/* Load variables from arguments if exists */
-	while ((ch = getopt(argc, argv, "hvUu:c:m:t:L:")) != -1)
+	while ((ch = getopt(argc, argv, "hvUC:u:c:m:t:L:")) != -1)
 		switch (ch) {
+			case 'C':
+				if (!cfgLoadConfig(optarg, &cfg)) {
+					cfg_loadAttribute(&cfg, "cfexec", "timeout", &User, DEFAULT_TIMEOUT);
+#ifndef HAVE_STRTONUM
+					Timeout = (int) strtol(szUser, NULL, 0);
+#else
+					Timeout = strtonum(AIT_GET_STR(&User), 0, 3600, &err);
+#endif
+					AIT_FREE_VAL(&User);
+					if (!Timeout && err) {
+						printf("Error:: in seconds for timeout %s - %s\n", optarg, err);
+						cfgUnloadConfig(&cfg);
+						return 1;
+					}
+					cfg_loadAttribute(&cfg, "cfexec", "suid", &User, DEFAULT_USER);
+					cfg_loadAttribute(&cfg, "cfexec", "mount", &Mount, DEFAULT_MOUNT);
+					cfg_loadAttribute(&cfg, "cfexec", "chroot", &Chroot, DEFAULT_CHROOT);
+
+					cfgUnloadConfig(&cfg);
+				}
+				break;
 			case 'v':
 				Verbose++;
 				break;
@@ -302,7 +344,7 @@ main(int argc, char **argv)
 	memset(szSess, 0, MAXPATHLEN);
 	snprintf(szSess, MAXPATHLEN, "%s%s-cfexec.LCK", DEFAULT_TMP, AIT_GET_STR(&Mount));
 	memset(szSLCK, 0, MAXPATHLEN);
-	snprintf(szSLCK, MAXPATHLEN, CFEXEC_SLOCK, DEFAULT_TMP);
+	snprintf(szSLCK, MAXPATHLEN, "%s%s-SYS-cfexec.LCK", DEFAULT_TMP, AIT_GET_STR(&Mount));
 
 	/* we have request for service lock! */
 	if (mod) {