* Port [3936] to 1.2.16 from trunk

 * Fix /ctcp FINGER leaking shell username when using oidentd



svn: 3937

doc/UPDATES

@@ -20,6 +20,7 @@
 * Fixed cmd_handle not properly bounds checking max handlen. (fixes #305)
 * Bans are now only retrieved from server after being opped. (addresses #406)
 * Update efnet server list and add new alias 'bs' for botset. (To get new defaults: 'set -YES servers -' and 'set -YES alias -')
+* Fix /ctcp FINGER leaking shell username when using oidentd
 
 1.2.15 - http://wraith.botpack.net/milestone/1.2.15
 * Fix a possible segfault when binaries compiled wrong

src/mod/ctcp.mod/ctcp.c

@@ -409,9 +409,8 @@ static int ctcp_FINGER(char *nick, char *uhost, struct userrec *u, char *object,
     idletime = now - cloak_awaytime;
   else if (cloak_heretime)
     idletime = now - cloak_heretime;
-  dprintf(DP_HELP, "NOTICE %s :\001%s %s (%s@%s) Idle %d second%s\001\n", nick, keyword, "",
-                   conf.username ? conf.username : conf.bot->nick, 
-                   (strchr(botuserhost, '@') + 1), (int) idletime, idletime == 1 ? "" : "s");
+  dprintf(DP_HELP, "NOTICE %s :\001%s %s (%s) Idle %d second%s\001\n", nick, keyword, "",
+                   botuserhost, (int) idletime, idletime == 1 ? "" : "s");
   return BIND_RET_BREAK;
 }