9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[svn] Merge old trunk r2779,r2785:

Browse source 
Show correct privilege name in a few ERR_NOPRIVS numerics.
This commit is contained in:
jilles 2007-03-28 07:49:48 -07:00
parent 5ea98c7a83
commit a5ea0e0dc4
5 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
jilles 2007/03/28 14:45:46 UTC (20070328-3295)
Log:
Merge old trunk r2695:
Send an SQUIT instead of an ERROR to announce /die to connected servers.
This will generate better server notices.
Changes: Modified:
+3 -2 trunk/modules/core/m_die.c (File Modified)
jilles 2007/03/28 14:33:50 UTC (20070328-3293) jilles 2007/03/28 14:33:50 UTC (20070328-3293)
Log: Log:
Merge old trunk r2294: Merge old trunk r2294:

6
extensions/m_ojoin.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Id: m_ojoin.c 3161 2007-01-25 07:23:01Z nenolod $ * $Id: m_ojoin.c 3297 2007-03-28 14:49:48Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -49,7 +49,7 @@ struct Message ojoin_msgtab = {
mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL }; mapi_clist_av1 ojoin_clist[] = { &ojoin_msgtab, NULL };
DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3161 $"); DECLARE_MODULE_AV1(ojoin, NULL, NULL, ojoin_clist, NULL, NULL, "$Revision: 3297 $");
/* /*
** mo_ojoin ** mo_ojoin
@ -65,7 +65,7 @@ mo_ojoin(struct Client *client_p, struct Client *source_p, int parc, const char
/* admins only */ /* admins only */
if(!IsOperAdmin(source_p)) if(!IsOperAdmin(source_p))
{ {
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "ojoin"); sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
return 0; return 0;
} }

6
extensions/m_opme.c
View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
* *
* $Id: m_opme.c 3161 2007-01-25 07:23:01Z nenolod $ * $Id: m_opme.c 3297 2007-03-28 14:49:48Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
#include "tools.h" #include "tools.h"
@ -46,7 +46,7 @@ struct Message opme_msgtab = {
mapi_clist_av1 opme_clist[] = { &opme_msgtab, NULL }; mapi_clist_av1 opme_clist[] = { &opme_msgtab, NULL };
DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3161 $"); DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3297 $");
/* /*
@ -64,7 +64,7 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
/* admins only */ /* admins only */
if(!IsOperAdmin(source_p)) if(!IsOperAdmin(source_p))
{ {
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "opme"); sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
return 0; return 0;
} }

2
include/serno.h
View file

@ -1 +1 @@
#define SERNO "20070328-3293" #define SERNO "20070328-3295"

8
unsupported/m_force.c
View file

@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: m_force.c 3161 2007-01-25 07:23:01Z nenolod $ * $Id: m_force.c 3297 2007-03-28 14:49:48Z jilles $
*/ */
#include "stdinc.h" #include "stdinc.h"
@ -70,7 +70,7 @@ struct Message forcepart_msgtab = {
mapi_clist_av1 force_clist[] = { &forcejoin_msgtab, &forcepart_msgtab, NULL }; mapi_clist_av1 force_clist[] = { &forcejoin_msgtab, &forcepart_msgtab, NULL };
DECLARE_MODULE_AV1(force, NULL, NULL, force_clist, NULL, NULL, "$Revision: 3161 $"); DECLARE_MODULE_AV1(force, NULL, NULL, force_clist, NULL, NULL, "$Revision: 3297 $");
/* /*
* m_forcejoin * m_forcejoin
@ -90,7 +90,7 @@ mo_forcejoin(struct Client *client_p, struct Client *source_p, int parc, const c
if(!IsOperAdmin(source_p)) if(!IsOperAdmin(source_p))
{ {
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "forcejoin"); sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
return 0; return 0;
} }
@ -241,7 +241,7 @@ mo_forcepart(struct Client *client_p, struct Client *source_p, int parc, const c
if(!IsOperAdmin(source_p)) if(!IsOperAdmin(source_p))
{ {
sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "forcepart"); sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
return 0; return 0;
} }