From: Gabriel B. <sh...@us...> - 2006-06-25 22:53:05
|
Update of /cvsroot/solidircd/solidircd-stable/src In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv31589/src Modified Files: channel.c m_services.c s_serv.c s_user.c Log Message: Minor changes. Index: s_user.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_user.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** s_user.c 19 Mar 2006 17:16:32 -0000 1.24 --- s_user.c 25 Jun 2006 22:53:01 -0000 1.25 *************** *** 363,383 **** - /* This should be used by servers only! */ - - int - m_svhost(aClient *cptr, aClient *sptr, int parc, char *parv[]) - { - aClient *acptr; - if (!IsServer(sptr)) - return 0; - if ((acptr=find_client(parv[1], NULL))==NULL) - return 0; - if (!IsUmodev(acptr)) - SetUmodev(acptr); - strncpyzt(acptr->user->host, parv[2], HOSTLEN+1); - sendto_serv_butone (cptr, ":%s SVHOST %s %s", parv[0], - acptr->name, acptr->user->host); - return 0; - } --- 363,366 ---- Index: channel.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/channel.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** channel.c 25 Jun 2006 21:03:35 -0000 1.18 --- channel.c 25 Jun 2006 22:53:01 -0000 1.19 *************** *** 1380,1387 **** int check_level(int level, int rlevel, aChannel *chptr, aClient *sptr) { ! if (level < rlevel && !IsPrivileged(sptr)) return 1; ! else if (MyClient(sptr) && (level < rlevel) && IsPrivileged(sptr)) do_opermode(chptr,sptr,0); --- 1380,1387 ---- int check_level(int level, int rlevel, aChannel *chptr, aClient *sptr) { ! if (level < rlevel && !IsSAdmin(sptr)) return 1; ! else if (MyClient(sptr) && (level < rlevel) && IsSAdmin(sptr)) do_opermode(chptr,sptr,0); *************** *** 1417,1421 **** if (IsULine(sptr) && !MyClient(sptr)) chanop=4; /* extra speshul access */ ! else if (IsOper(sptr) && !is_chan_op(sptr, chptr) && !is_halfop(sptr,chptr) && !IsULine(sptr)) chanop=3; else if (is_chan_op(sptr, chptr) || (IsServer(sptr) && chptr->channelts!=0)) --- 1417,1421 ---- if (IsULine(sptr) && !MyClient(sptr)) chanop=4; /* extra speshul access */ ! else if (IsSAdmin(sptr) && !is_chan_op(sptr, chptr) && !is_halfop(sptr,chptr) && !IsULine(sptr)) chanop=3; else if (is_chan_op(sptr, chptr) || (IsServer(sptr) && chptr->channelts!=0)) Index: m_services.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/m_services.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** m_services.c 5 Jul 2005 21:53:41 -0000 1.4 --- m_services.c 25 Jun 2006 22:53:01 -0000 1.5 *************** *** 530,533 **** --- 530,552 ---- } + /* This should be used by servers only! */ + + int + m_svhost(aClient *cptr, aClient *sptr, int parc, char *parv[]) + { + aClient *acptr; + if (!IsServer(sptr)) + return 0; + if ((acptr=find_client(parv[1], NULL))==NULL) + return 0; + if (!IsUmodev(acptr)) + SetUmodev(acptr); + strncpyzt(acptr->user->host, parv[2], HOSTLEN+1); + sendto_serv_butone (cptr, ":%s SVHOST %s %s", parv[0], + acptr->name, acptr->user->host); + return 0; + } + + /* m_chankill Index: s_serv.c =================================================================== RCS file: /cvsroot/solidircd/solidircd-stable/src/s_serv.c,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** s_serv.c 18 Apr 2006 13:01:21 -0000 1.18 --- s_serv.c 25 Jun 2006 22:53:01 -0000 1.19 *************** *** 4125,4277 **** } - /* - ** m_freeze (stop a user from sending data to the server) - */ - - #ifdef ENABLE_FREEZE - - int m_freeze(aClient *cptr, aClient *sptr, int parc, char *parv[]) - { - aClient *target; - - if (check_registered(sptr)) - return 0; - - if (parc < 2) - { - sendto_one (sptr, err_str(ERR_NEEDMOREPARAMS), - me.name, parv[0], "FREEZE"); - return 0; - } - - target = find_client (parv[1], NULL); - - if (target == NULL) - { - sendto_one (sptr, err_str (ERR_NOSUCHNICK), - me.name, sptr->name, parv[1]); - return 0; - } - - - if (IsServer(cptr)) { - sendto_serv_butone(cptr, ":%s FREEZE :%s", parv[0], parv[1]); - target->user->special_mode = 3; - return 0; - } - - if (!IsOper(sptr)) - { - sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); - return 0; - } - - if (IsServer (target)) - { - sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); - return 0; - } - - - if (IsOper (target)) - { - sendto_ops("%s (%s@%s) tried to FREEZE ircop [%s]", sptr->name, - sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(&me, ":%s GNOTICE :%s (%s@%s) tried to FREEZE ircop [%s]", - me.name, sptr->name, sptr->user->username, sptr->user->host, parv[1]); - return 0; - } - - target->user->special_mode = 3; - - #ifdef MAGICWAND_FREEZE - - - sendto_one(target, ":%s NOTICE %s :*** A magic wand has been waved over" - " your head and frozen you",me.name, parv[1], parv[0]); - #endif - sendto_ops("%s (%s@%s) added SILENT FREEZE on [%s]", sptr->name, - sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(&me, ":%s GLOBOPS :%s (%s@%s) added SILENT FREEZE on [%s]", - me.name, sptr->name, sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(cptr, ":%s FREEZE %s", IsServer(cptr) ? parv[0] : me.name, parv[1]); - - return 0; - } - - - - /* - ** m_unfreeze (stop a user from sending data to the server) - */ - - int m_unfreeze(aClient *cptr, aClient *sptr, int parc, char *parv[]) - { - aClient *target; - - if (check_registered(sptr)) - return 0; - - if (parc < 2) - { - sendto_one (sptr, err_str(ERR_NEEDMOREPARAMS), - me.name, parv[0], "UNFREEZE"); - return 0; - } - - if (!IsOper(sptr)) - { - sendto_one(sptr, err_str(ERR_NOPRIVILEGES), me.name, parv[0]); - return 0; - } - - target = find_client (parv[1], NULL); - if (target == NULL) - { - sendto_one (sptr, err_str (ERR_NOSUCHNICK), - me.name, sptr->name, parv[1]); - return 0; - } - - if (IsServer(cptr)) { - sendto_serv_butone(cptr, ":%s UNFREEZE :%s", parv[0], parv[1]); - target->user->special_mode = 0; - return 0; - } - - if (IsOper (target)) - { - sendto_ops("%s (%s@%s) tried to UNFREEZE ircop [%s]", sptr->name, - sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(&me, ":%s GNOTICE :%s (%s@%s) tried to UNFREEZE ircop [%s]", - me.name, sptr->name, sptr->user->username, sptr->user->host, parv[1]); - return 0; - } - - target->user->special_mode = 0; - - #ifdef MAGICWAND_FREEZE - - sendto_one(target, ":%s NOTICE %s :*** %s waves a magic wand " - "and returns you to normality", me.name, parv[1], parv[0]); - #endif - - sendto_ops("%s (%s@%s) unset SILENT FREEZE on [%s]", sptr->name, - sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(&me, ":%s GNOTICE :%s (%s@%s) set UNFREEZE on [%s]", - me.name, sptr->name, sptr->user->username, sptr->user->host, parv[1]); - - sendto_serv_butone(cptr, ":%s UNFREEZE :%s", parv[0], parv[1]); - - return 0; - } - - - #endif --- 4125,4128 ---- |