CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Branch tags: u2_10_11_03
Commit time: 2002-10-16 19:50:57 UTC
Modified files:
Tag: u2_10_11_03
ChangeLog include/patchlevel.h ircd/channel.c
Log message:
Author: "net" <[EMAIL PROTECTED]>
Log message:
This patch should prevent users with account and no hidden host from joining a
channel that has baned their hidden host.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.290.2.125 ircu2.10/ChangeLog:1.290.2.125.2.1
--- ircu2.10/ChangeLog:1.290.2.125 Thu Oct 10 02:13:23 2002
+++ ircu2.10/ChangeLog Wed Oct 16 12:50:46 2002
@@ -1,3 +1,13 @@
+2002-10-15 Tim Vogelsang <[EMAIL PROTECTED]>
+
+ * ircd/channel.c (is_banned): users that are using account and not
+ using the hidden host feature should have their accounts checked
+ against other hidden hosts banned in a attempted channel join
+
+2002-10-17 Perry Lorier <[EMAIL PROTECTED]>
+
+ * include/patchlevel.h (PATCHLEVEL): branch u2.10.11.03
+
2002-10-10 Perry Lorier <[EMAIL PROTECTED]>
* include/patchlevel.h (PATCHLEVEL): release u2.10.11.02
Index: ircu2.10/include/patchlevel.h
diff -u ircu2.10/include/patchlevel.h:1.10.4.61
ircu2.10/include/patchlevel.h:1.10.4.61.2.1
--- ircu2.10/include/patchlevel.h:1.10.4.61 Thu Oct 10 02:13:24 2002
+++ ircu2.10/include/patchlevel.h Wed Oct 16 12:50:47 2002
@@ -15,10 +15,10 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: patchlevel.h,v 1.10.4.61 2002/10/10 09:13:24 isomer Exp $
+ * $Id: patchlevel.h,v 1.10.4.61.2.1 2002/10/16 19:50:47 isomer Exp $
*
*/
-#define PATCHLEVEL "02"
+#define PATCHLEVEL "03"
#define RELEASE ".11."
Index: ircu2.10/ircd/channel.c
diff -u ircu2.10/ircd/channel.c:1.73.2.10 ircu2.10/ircd/channel.c:1.73.2.10.4.1
--- ircu2.10/ircd/channel.c:1.73.2.10 Sat Sep 14 13:44:32 2002
+++ ircu2.10/ircd/channel.c Wed Oct 16 12:50:47 2002
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
- * $Id: channel.c,v 1.73.2.10 2002/09/14 20:44:32 kev Exp $
+ * $Id: channel.c,v 1.73.2.10.4.1 2002/10/16 19:50:47 isomer Exp $
*/
#include "config.h"
@@ -408,6 +408,7 @@
struct Membership* member)
{
struct SLink* tmp;
+ char tmphost[HOSTLEN + 1];
char nu_host[NUH_BUFSIZE];
char nu_realhost[NUH_BUFSIZE];
char nu_ip[NUI_BUFSIZE];
@@ -423,10 +424,20 @@
s = make_nick_user_host(nu_host, cli_name(cptr), (cli_user(cptr))->username,
(cli_user(cptr))->host);
- if (HasHiddenHost(cptr))
- sr = make_nick_user_host(nu_realhost, cli_name(cptr),
- (cli_user(cptr))->username,
- cli_user(cptr)->realhost);
+
+ if (cli_flags(cptr) & FLAGS_ACCOUNT) {
+ if (HasHiddenHost(cptr))
+ sr = make_nick_user_host(nu_realhost, cli_name(cptr),
+ cli_user(cptr)->username,
+ cli_user(cptr)->realhost);
+ else {
+ ircd_snprintf(0, tmphost, HOSTLEN, "%s.%s",
+ cli_user(cptr)->account, feature_str(FEAT_HIDDEN_HOST));
+ sr = make_nick_user_host(nu_realhost, cli_name(cptr),
+ cli_user(cptr)->username,
+ tmphost);
+ }
+ }
for (tmp = chptr->banlist; tmp; tmp = tmp->next) {
if ((tmp->flags & CHFL_BAN_IPMASK)) {
----------------------- End of diff -----------------------
