From b37e5ce0621b276a7cd985ae93f58da16b3ee9ea Mon Sep 17 00:00:00 2001
From: aland <aland>
Date: Sat, 23 Apr 2005 00:50:55 +0000
Subject: [PATCH] 	cl->shortname may now be NULL

---
 src/modules/rlm_radutmp/rlm_radutmp.c  | 2 +-
 src/modules/rlm_radutmp/rlm_radutmp2.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/rlm_radutmp/rlm_radutmp.c b/src/modules/rlm_radutmp/rlm_radutmp.c
index b990947..f017b58 100644
--- a/src/modules/rlm_radutmp/rlm_radutmp.c
+++ b/src/modules/rlm_radutmp/rlm_radutmp.c
@@ -339,7 +339,7 @@ static int radutmp_accounting(void *instance, REQUEST *request)
 		 */
 		cl = client_find(&request->packet->src_ipaddr);
 		if (!cl) rad_assert(0 == 1); /* WTF? */
-		if (cl->shortname[0]) {
+		if (cl->shortname && cl->shortname[0]) {
 			nas = cl->shortname;
 		} else {
 			nas = cl->longname;
diff --git a/src/modules/rlm_radutmp/rlm_radutmp2.c b/src/modules/rlm_radutmp/rlm_radutmp2.c
index 72f8a56..b2eb592 100644
--- a/src/modules/rlm_radutmp/rlm_radutmp2.c
+++ b/src/modules/rlm_radutmp/rlm_radutmp2.c
@@ -871,7 +871,7 @@ static int radutmp_accounting(void *instance, REQUEST *request)
 		 */
 		cl = client_find(nas_address);
 		if (cl) {
-			if (cl->shortname[0]) {
+			if (cl->shortname && cl->shortname[0]) {
 				nas = cl->shortname;
 			} else {
 				nas = cl->longname;
-- 
2.1.4