ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/modules/m_svsmode.c
(Generate patch)

Comparing ircd-hybrid/trunk/modules/m_svsmode.c (file contents):
Revision 3561 by michael, Fri May 16 13:51:39 2014 UTC vs.
Revision 5548 by michael, Thu Feb 12 14:26:11 2015 UTC

# Line 2 | Line 2
2   *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4   *  Copyright (c) 1999 Bahamut development team.
5 < *  Copyright (c) 2011-2014 ircd-hybrid development team
5 > *  Copyright (c) 2011-2015 ircd-hybrid development team
6   *
7   *  This program is free software; you can redistribute it and/or modify
8   *  it under the terms of the GNU General Public License as published by
# Line 16 | Line 16
16   *
17   *  You should have received a copy of the GNU General Public License
18   *  along with this program; if not, write to the Free Software
19 < *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19 > *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
20   *  USA
21   */
22  
# Line 28 | Line 28
28   #include "stdinc.h"
29   #include "client.h"
30   #include "ircd.h"
31 – #include "server.h"
31   #include "send.h"
32   #include "channel_mode.h"
33   #include "parse.h"
# Line 50 | Line 49
49   *      - parv[1] = nickname
50   *      - parv[2] = TS
51   *      - parv[3] = mode
52 < *      - parv[4] = optional argument (services id, vhost)
52 > *      - parv[4] = optional argument (services account, vhost)
53   */
54   static int
55   ms_svsmode(struct Client *source_p, int parc, char *parv[])
56   {
57 +  const struct user_modes *tab = NULL;
58    struct Client *target_p = NULL;
59    int what = MODE_ADD;
60 <  unsigned int flag = 0, setmodes = 0;
60 >  const unsigned int setmodes = target_p->umodes;
61    const char *modes = NULL, *extarg = NULL;
62    time_t ts = 0;
63  
# Line 74 | Line 74 | ms_svsmode(struct Client *source_p, int
74    if (ts && (ts != target_p->tsinfo))
75      return 0;
76  
77 –  setmodes = target_p->umodes;
78 –
77    for (const char *m = modes; *m; ++m)
78    {
79      switch (*m)
# Line 89 | Line 87 | ms_svsmode(struct Client *source_p, int
87  
88        case 'd':
89          if (!EmptyString(extarg))
90 <          strlcpy(target_p->svid, extarg, sizeof(target_p->svid));
90 >          strlcpy(target_p->account, extarg, sizeof(target_p->account));
91          break;
92  
93        case 'x':
# Line 105 | Line 103 | ms_svsmode(struct Client *source_p, int
103  
104            if (MyConnect(target_p))
105            {
106 <            dlink_node *dm = NULL;
106 >            dlink_node *node = NULL;
107  
108              detach_conf(target_p, CONF_OPER);
109              ClrOFlag(target_p);
110 <            DelUMode(target_p, ConfigFileEntry.oper_only_umodes);
110 >            DelUMode(target_p, ConfigGeneral.oper_only_umodes);
111  
112 <            if ((dm = dlinkFindDelete(&oper_list, target_p)))
113 <              free_dlink_node(dm);
112 >            if ((node = dlinkFindDelete(&oper_list, target_p)))
113 >              free_dlink_node(node);
114            }
115          }
116  
# Line 138 | Line 136 | ms_svsmode(struct Client *source_p, int
136          break;
137  
138        default:
139 <        if ((flag = user_modes[(unsigned char)*m]))
139 >        if ((tab = umode_map[(unsigned char)*m]))
140          {
141            if (what == MODE_ADD)
142 <            AddUMode(target_p, flag);
142 >            AddUMode(target_p, tab->flag);
143            else
144 <            DelUMode(target_p, flag);
144 >            DelUMode(target_p, tab->flag);
145          }
146  
147          break;
# Line 151 | Line 149 | ms_svsmode(struct Client *source_p, int
149    }
150  
151    if (extarg)
152 <    sendto_server(source_p, NOCAPS, NOCAPS, ":%s SVSMODE %s %lu %s %s",
152 >    sendto_server(source_p, 0, 0, ":%s SVSMODE %s %lu %s %s",
153                    source_p->id,
154                    target_p->id, (unsigned long)target_p->tsinfo, modes, extarg);
155    else
156 <    sendto_server(source_p, NOCAPS, NOCAPS, ":%s SVSMODE %s %lu %s",
156 >    sendto_server(source_p, 0, 0, ":%s SVSMODE %s %lu %s",
157                    source_p->id,
158                    target_p->id, (unsigned long)target_p->tsinfo, modes);
159  
# Line 163 | Line 161 | ms_svsmode(struct Client *source_p, int
161    {
162      char modebuf[IRCD_BUFSIZE] = "";
163  
164 <    send_umode(target_p, target_p, setmodes, 0xffffffff, modebuf);
164 >    send_umode(target_p, target_p, setmodes, modebuf);
165    }
166  
167    return 0;
# Line 171 | Line 169 | ms_svsmode(struct Client *source_p, int
169  
170   static struct Message svsmode_msgtab =
171   {
172 <  "SVSMODE", 0, 0, 4, MAXPARA, MFLG_SLOW, 0,
172 >  "SVSMODE", NULL, 0, 0, 4, MAXPARA, MFLG_SLOW, 0,
173    { m_ignore, m_ignore, ms_svsmode, m_ignore, m_ignore, m_ignore }
174   };
175  

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)