--- libaitcfg/src/aitcfg.c	2013/05/30 09:12:27	1.9
+++ libaitcfg/src/aitcfg.c	2026/08/04 18:59:27	1.18
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.c,v 1.9 2013/05/30 09:12:27 misho Exp $
+* $Id: aitcfg.c,v 1.18 2026/08/04 18:59:27 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
+Copyright 2004 - 2026
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -71,8 +71,8 @@ cfg_tree_cmp(struct tagCfg *a, struct tagCfg *b)
 
 	assert(a && b);
 
-	ret = ((AIT_KEY(&a->cfg_sec) << 16) | AIT_KEY(&a->cfg_attr)) - 
-		((AIT_KEY(&b->cfg_sec) << 16) | AIT_KEY(&b->cfg_attr));
+	ret = ((AIT_KEY(&a->cfg_sec) << 15) | AIT_KEY(&a->cfg_attr)) - 
+		((AIT_KEY(&b->cfg_sec) << 15) | AIT_KEY(&b->cfg_attr));
 
 	if (ret < 0)
 		return -1;
@@ -118,18 +118,63 @@ cfg_SetErr(int eno, char *estr, ...)
 /*
  * cfgInitConfig() - Init config root
  *
+ * return: NULL error or !=NULL allocated config root
+ */
+cfg_root_t *
+cfgInitConfig()
+{
+	cfg_root_t *cfg = NULL;
+
+	cfg = e_malloc(sizeof(cfg_root_t));
+	if (!cfg) {
+		cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		return NULL;
+	} else
+		memset(cfg, 0, sizeof(cfg_root_t));
+
+	pthread_mutex_init(&cfg->rc_mtx, NULL);
+
+	TAILQ_INIT(cfg);
+	RB_INIT(cfg);
+	return cfg;
+}
+
+/*
+ * cfgEndConfig() - Free resources & config root
+ *
+ * @pcfg = Config root
+ * return: none
+ */
+void
+cfgEndConfig(cfg_root_t **pcfg)
+{
+	if (pcfg && *pcfg) {
+		cfgClearConfig(*pcfg);
+		pthread_mutex_destroy(&(*pcfg)->rc_mtx);
+		e_free(*pcfg);
+		*pcfg = NULL;
+	}
+}
+
+/*
+ * cfgInitConfigExt() - Init existed config root
+ *
  * @cfg = Config root
- * return: -1 error or 0 ok
+ * return: -1 error or 0 inited config root
  */
 int
-cfgInitConfig(cfg_root_t * __restrict cfg)
+cfgInitConfigExt(cfg_root_t * __restrict cfg)
 {
-	if (!cfg)
+	if (!cfg) {
+		cfg_SetErr(EINVAL, "Invalid parameter");
 		return -1;
+	}
 
+	memset(cfg, 0, sizeof(cfg_root_t));
+
 	pthread_mutex_init(&cfg->rc_mtx, NULL);
 
-	SLIST_INIT(cfg);
+	TAILQ_INIT(cfg);
 	RB_INIT(cfg);
 	return 0;
 }
@@ -147,11 +192,10 @@ cfgLoadConfig(const char *cfgName, cfg_root_t * __rest
 	FILE *f;
 	int ret;
 
-	if (!cfgName || !cfg) {
+	if (!cfgName || cfgInitConfigExt(cfg)) {
 		cfg_SetErr(EINVAL, "Invalid parameter(s)");
 		return -1;
-	} else
-		cfgInitConfig(cfg);
+	}
 
 	f = fopen(cfgName, "r");
 	if (!f) {
@@ -159,13 +203,43 @@ cfgLoadConfig(const char *cfgName, cfg_root_t * __rest
 		return -1;
 	}
 
-	ret = cfgReadConfig(f, cfg);
+	ret = cfg_ReadConfig(f, cfg, 1);
 
 	fclose(f);
 	return ret;
 }
 
 /*
+ * cfgLoadConfigExt() - Load config from file with recursion level of includes
+ *
+ * @cfgName = Config filename
+ * @cfg = Config root
+ * @lvl = Level of include recursion
+ * return: -1 error or 0 ok
+ */
+int
+cfgLoadConfigExt(const char *cfgName, cfg_root_t * __restrict cfg, int lvl)
+{
+	FILE *f;
+	int ret;
+
+	if (!cfgName || cfgInitConfigExt(cfg)) {
+		cfg_SetErr(EINVAL, "Invalid parameter(s)");
+		return -1;
+	}
+
+	f = fopen(cfgName, "r");
+	if (!f) {
+		LOGERR;
+		return -1;
+	}
+
+	ret = cfg_ReadConfig(f, cfg, lvl);
+
+	fclose(f);
+	return ret;
+}
+/*
  * cfgClearConfig() - Clear config and free resources
  *
  * @cfg = Config root
@@ -180,8 +254,8 @@ cfgClearConfig(cfg_root_t * __restrict cfg)
 		return;
 
 	CFG_RC_LOCK(cfg);
-	while ((av = SLIST_FIRST(cfg))) {
-		SLIST_REMOVE_HEAD(cfg, cfg_next);
+	while ((av = TAILQ_FIRST(cfg))) {
+		TAILQ_REMOVE(cfg, av, cfg_next);
 
 		AIT_FREE_VAL(&av->cfg_val);
 		AIT_FREE_VAL(&av->cfg_attr);
@@ -206,6 +280,7 @@ cfgUnloadConfig(cfg_root_t * __restrict cfg)
 
 	cfgClearConfig(cfg);
 	pthread_mutex_destroy(&cfg->rc_mtx);
+	memset(&cfg->rc_mtx, 0, sizeof cfg->rc_mtx);
 }
 
 /*
@@ -231,7 +306,7 @@ cfgCreateConfig(const char *csConfigName, cfg_root_t *
 		return -1;
 	}
 	
-	ret = cfgWriteConfig(f, cfg, whitespace);
+	ret = cfgWriteConfigRaw(f, cfg, whitespace);
 
 	fclose(f);
 	return ret;
@@ -240,15 +315,20 @@ cfgCreateConfig(const char *csConfigName, cfg_root_t *
 /*
  * cfgInitPasswd() - Init password root
  *
- * @pwd = Password root
- * return: -1 error or 0 ok
+ * return: NULL error or !=NULL allocated password root
  */
-int
-cfgInitPasswd(pwd_root_t * __restrict pwd)
+pwd_root_t *
+cfgInitPasswd()
 {
-	if (!pwd)
-		return -1;
+	pwd_root_t *pwd = NULL;
 
+	pwd = e_malloc(sizeof(pwd_root_t));
+	if (!pwd) {
+		cfg_SetErr(elwix_GetErrno(), "%s", elwix_GetError());
+		return NULL;
+	} else
+		memset(pwd, 0, sizeof(pwd_root_t));
+
 	pthread_mutex_init(&pwd->pwd_mtx, NULL);
 
 	SLIST_INIT(pwd);
@@ -257,6 +337,23 @@ cfgInitPasswd(pwd_root_t * __restrict pwd)
 }
 
 /*
+ * cfgEndPasswd() - Free resources & password root
+ *
+ * @ppwd = Password root
+ * return: none
+ */
+void
+cfgEndPasswd(pwd_root_t **ppwd)
+{
+	if (ppwd && *ppwd) {
+		cfgClearPasswd(*ppwd);
+		pthread_mutex_destroy(&(*ppwd)->pwd_mtx);
+		e_free(*ppwd);
+		*ppwd = NULL;
+	}
+}
+
+/*
  * cfgLoadPasswd() - Load passwords from file
  *
  * @pwdName = Passwords filename
@@ -272,8 +369,14 @@ cfgLoadPasswd(const char *pwdName, pwd_root_t * __rest
 	if (!pwdName || !pwd) {
 		cfg_SetErr(EINVAL, "Invalid parameter(s)");
 		return -1;
-	} else
-		cfgInitPasswd(pwd);
+	} else {
+		memset(pwd, 0, sizeof(pwd_root_t));
+
+		pthread_mutex_init(&pwd->pwd_mtx, NULL);
+
+		SLIST_INIT(pwd);
+		RB_INIT(pwd);
+	}
 
 	f = fopen(pwdName, "r");
 	if (!f) {