--- libaitcfg/src/pq.c	2012/09/19 12:07:23	1.1.2.4
+++ libaitcfg/src/pq.c	2012/09/19 12:23:12	1.1.2.5
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@openbsd-bg.org>
 *
 * $Author: misho $
-* $Id: pq.c,v 1.1.2.4 2012/09/19 12:07:23 misho Exp $
+* $Id: pq.c,v 1.1.2.5 2012/09/19 12:23:12 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -276,6 +276,7 @@ cfg_getPasswd(pwd_root_t * __restrict pwd, int criteri
 {
 	struct tagUser *u;
 	va_list lst;
+	char *str;
 
 	if (!pwd)
 		return NULL;
@@ -283,7 +284,11 @@ cfg_getPasswd(pwd_root_t * __restrict pwd, int criteri
 	va_start(lst, criteria);
 	switch (criteria) {
 		case PWD_CRIT_NAME:
-			u = _selectPasswd(pwd, 0, va_arg(lst, char*));
+			str = va_arg(lst, char*);
+			if (!str)
+				u = NULL;
+			else
+				u = _selectPasswd(pwd, 0, str);
 			break;
 		case PWD_CRIT_UID:
 			u = _selectPasswd(pwd, va_arg(lst, u_int), NULL);