* Port [3460] to 1.2.14

 * Bad uname EMAILS now include the localhub's nick. (fixes #354)



svn: 3461

doc/UPDATES

@@ -52,6 +52,7 @@ Lines prefixed with '-' were disabled before release and are not finished, or ar
 * Limit bots no longer set limit when 'chanmode -l' is set. (fixes #294)
 * Fixed +closed from interfering with 'chanmode -pi'. (fixes #294)
 * Fix logging/usage bug in cmd_mop. (fixes #313)
+* Bad uname EMAILS now include the localhub's nick. (fixes #354)
 
 1.2.13 - http://wraith.shatow.net/milestone/1.2.13
 * Fix cmd_chanset accepting invalid flags

src/shell.c

@@ -815,9 +815,10 @@ void baduname(char *confhas, char *myuname) {
 
     uname(&un);
     simple_snprintf(subject, sizeof subject, "CONF/UNAME() mismatch notice");
-    simple_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\nMy binary 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"), 
+    simple_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\nMy binary is: %s\nLocalhub: %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 ? conf.username : "unknown", 
                                   binname,
+                                  conf.bots && conf.bots->nick ? conf.bots->nick : origbotname,
                                   confhas, myuname, un.nodename);
     email(subject, msg, EMAIL_OWNERS);
   }