From: Jochen Eisinger <coffee@silcnet.org>
Date: Sun, 1 Oct 2006 18:41:08 +0000 (+0000)
Subject: Sun Oct  1 20:39:34 CEST 2006  Jochen Eisinger <coffee@silcnet.org>
X-Git-Tag: silc.client.1.0.4~8
X-Git-Url: http://git.silcnet.org/gitweb/?a=commitdiff_plain;h=7608fec652751a6c916aad6d8992c7c50ee73358;p=silc.git

Sun Oct  1 20:39:34 CEST 2006  Jochen Eisinger <coffee@silcnet.org>

	* Always return a valid username.  Affected file
	  lib/silcutil/unix/silcunixutil.c
---

diff --git a/CHANGES b/CHANGES
index 408b8b5e..a9ade5d1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+Sun Oct  1 20:39:34 CEST 2006  Jochen Eisinger <coffee@silcnet.org>
+
+	* Always return a valid username.  Affected file
+	  lib/silcutil/unix/silcunixutil.c
+
 Sun Jul  2 19:12:36 CEST 2006  Jochen Eisinger <coffee@silcnet.org>
 
 	* Make gmake the default for autodist, so I can properly work
diff --git a/lib/silcutil/unix/silcunixutil.c b/lib/silcutil/unix/silcunixutil.c
index 92bfaded..24c93a1c 100644
--- a/lib/silcutil/unix/silcunixutil.c
+++ b/lib/silcutil/unix/silcunixutil.c
@@ -135,13 +135,13 @@ char *silc_get_username()
   char *logname = NULL;
   
   logname = getenv("LOGNAME");
-  if (!logname) {
+  if (!logname || !strlen(logname)) {
     logname = getlogin();
-    if (!logname) {
+    if (!logname || !strlen(logname)) {
       struct passwd *pw;
 
       pw = getpwuid(getuid());
-      if (!pw)
+      if (!pw || !strlen(pw->pw_name))
 	return strdup("foo");
 
       logname = pw->pw_name;