* baduname() wasn't sending login correctly.

svn: 947

doc/UPDATES

@@ -3,8 +3,8 @@ This is a summary of ChangeLog basically.
 1.1.6
 
 1.Fixed a cosmetic error in cmd_downbots.
-2.Cleaned up and removed a ton (30K+ compiled) of un-needed and old code.
-3.Fixed a bug in defalg_user()
+2.Cleaned up and removed a ton (50K+ compiled) of un-needed and old code.
+3.Fixed a bug in deflag_user()
 4.Several user cmds on BOTS were not being shared.
 5.Fixed a fatal bug in +take.
 6.Removed garblestrings dependancy on binary checksum checking.
@@ -16,6 +16,7 @@ This is a summary of ChangeLog basically.
 12.Added console settings for what to show on login: banner, channels, bots, whom.
 13.Changed default .color to on, and all of the new settings are default on as well.
 14.Several msgc cmds were replying incorrectly, fixed.
+15.Fixed the bad uname email not giving the login.
 
 1.1.5
 

src/shell.c

@@ -764,7 +764,9 @@ void baduname(char *confhas, char *my_uname) {
 
     uname(&un);
     egg_snprintf(subject, sizeof subject, "CONF/UNAME() mismatch notice");
-    egg_snprintf(msg, sizeof msg, STR("This is an auto email from a wraith bot which has you in it's OWNER_EMAIL list..\n \nThe uname() output on this box has changed, probably due to a kernel upgrade...\nMy login is: %s\nConf : %s\nUname(): %s\n \nThis email will only be sent once a day while this error is present.\nYou need to login to my shell (%s) and fix my local config.\n"), conf.username, confhas, my_uname, un.nodename);
+    egg_snprintf(msg, sizeof msg, STR("This is an auto email from a wraith bot which has you in it's OWNER_EMAIL list..\n \nThe uname() output on this box has changed, probably due to a kernel upgrade...\nMy login is: %s\nConf   : %s\nUname(): %s\n \nThis email will only be sent once a day while this error is present.\nYou need to login to my shell (%s) and fix my local config.\n"), 
+                                  conffile.username ? conffile.username : (conf.username ? conf.username : "unknown"), 
+                                  confhas, my_uname, un.nodename);
     email(subject, msg, EMAIL_OWNERS);
   }
   free(tmpfile);