--- libaitcfg/src/aitcfg.c	2012/07/25 15:24:20	1.7
+++ libaitcfg/src/aitcfg.c	2014/01/30 08:30:47	1.11
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: aitcfg.c,v 1.7 2012/07/25 15:24:20 misho Exp $
+* $Id: aitcfg.c,v 1.11 2014/01/30 08:30:47 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
+Copyright 2004 - 2014
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,6 @@ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF TH
 SUCH DAMAGE.
 */
 #include "global.h"
-#include "aitcfg.h"
 
 
 #pragma GCC visibility push(hidden)
@@ -52,7 +51,20 @@ SUCH DAMAGE.
 int cfg_Errno;
 char cfg_Error[STRSIZ];
 
-inline int
+int
+cfg_Write(FILE *f, char *fmt, ...)
+{
+	int ret = 0;
+	va_list lst;
+
+	va_start(lst, fmt);
+	ret = vfprintf(f, fmt, lst);
+	va_end(lst);
+
+	return ret;
+}
+
+int
 cfg_tree_cmp(struct tagCfg *a, struct tagCfg *b)
 {
 	int ret;
@@ -76,21 +88,21 @@ RB_GENERATE(tagRC, tagCfg, cfg_node, cfg_tree_cmp);
 
 
 // cfg_GetErrno() Get error code of last operation
-inline int
+int
 cfg_GetErrno()
 {
 	return cfg_Errno;
 }
 
 // cfg_GetError() Get error text of last operation
-inline const char *
+const char *
 cfg_GetError()
 {
 	return cfg_Error;
 }
 
 // cfg_SetErr() Set error to variables for internal use!!!
-inline void
+void
 cfg_SetErr(int eno, char *estr, ...)
 {
 	va_list lst;
@@ -117,7 +129,7 @@ cfgInitConfig(cfg_root_t * __restrict cfg)
 
 	pthread_mutex_init(&cfg->rc_mtx, NULL);
 
-	SLIST_INIT(cfg);
+	TAILQ_INIT(cfg);
 	RB_INIT(cfg);
 	return 0;
 }
@@ -168,13 +180,13 @@ 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);
 		AIT_FREE_VAL(&av->cfg_sec);
-		io_free(av);
+		e_free(av);
 	}
 	cfg->rbh_root = NULL;
 	CFG_RC_UNLOCK(cfg);
@@ -220,6 +232,134 @@ cfgCreateConfig(const char *csConfigName, cfg_root_t *
 	}
 	
 	ret = cfgWriteConfig(f, cfg, whitespace);
+
+	fclose(f);
+	return ret;
+}
+
+/*
+ * cfgInitPasswd() - Init password root
+ *
+ * @pwd = Password root
+ * return: -1 error or 0 ok
+ */
+int
+cfgInitPasswd(pwd_root_t * __restrict pwd)
+{
+	if (!pwd)
+		return -1;
+
+	pthread_mutex_init(&pwd->pwd_mtx, NULL);
+
+	SLIST_INIT(pwd);
+	RB_INIT(pwd);
+	return 0;
+}
+
+/*
+ * cfgLoadPasswd() - Load passwords from file
+ *
+ * @pwdName = Passwords filename
+ * @pwd = Password root
+ * return: -1 error or 0 ok
+ */
+int
+cfgLoadPasswd(const char *pwdName, pwd_root_t * __restrict pwd)
+{
+	FILE *f;
+	int ret;
+
+	if (!pwdName || !pwd) {
+		cfg_SetErr(EINVAL, "Invalid parameter(s)");
+		return -1;
+	} else
+		cfgInitPasswd(pwd);
+
+	f = fopen(pwdName, "r");
+	if (!f) {
+		LOGERR;
+		return -1;
+	}
+
+	ret = cfgReadPasswd(f, pwd);
+
+	fclose(f);
+	return ret;
+}
+
+/*
+ * cfgClearPasswd() - Clear passwords and free resources
+ *
+ * @cfg = Password root
+ * return: none
+ */
+void
+cfgClearPasswd(pwd_root_t * __restrict pwd)
+{
+	struct tagUser *p;
+
+	if (!pwd)
+		return;
+
+	PWD_LOCK(pwd);
+	while ((p = SLIST_FIRST(pwd))) {
+		SLIST_REMOVE_HEAD(pwd, usr_next);
+
+		AIT_FREE_VAL(&p->usr_name);
+		AIT_FREE_VAL(&p->usr_pass);
+		AIT_FREE_VAL(&p->usr_uid);
+		AIT_FREE_VAL(&p->usr_gid);
+		AIT_FREE_VAL(&p->usr_class);
+		AIT_FREE_VAL(&p->usr_change);
+		AIT_FREE_VAL(&p->usr_expire);
+		AIT_FREE_VAL(&p->usr_realm);
+		AIT_FREE_VAL(&p->usr_home);
+		AIT_FREE_VAL(&p->usr_shell);
+		e_free(p);
+	}
+	pwd->rbh_root = NULL;
+	PWD_UNLOCK(pwd);
+}
+
+/*
+ * cfgUnloadPasswd() - Unload passwords from memory and destroy resources
+ *
+ * @pwd = Password root
+ * return: none
+ */
+void
+cfgUnloadPasswd(pwd_root_t * __restrict pwd)
+{
+	if (!pwd)
+		return;
+
+	cfgClearPasswd(pwd);
+	pthread_mutex_destroy(&pwd->pwd_mtx);
+}
+
+/*
+ * cfgCreatePasswd() - Create password file from memory
+ *
+ * @pwdName = New password filename
+ * @pwd = Password root
+ * return: -1 error or 0 ok
+ */
+int
+cfgCreatePasswd(const char *pwdName, pwd_root_t * __restrict pwd)
+{
+	FILE *f;
+	int ret;
+
+	if (!pwdName || !pwd)
+		return -1;
+
+	f = fopen(pwdName, "w");
+	if (!f) {
+		LOGERR;
+		return -1;
+	}
+	
+	ret = cfgWritePasswd(f, pwd);
 
 	fclose(f);
 	return ret;