From: pk910 <philipp@zoelle1.de>
Date: Wed, 27 Feb 2013 20:17:17 +0000 (+0100)
Subject: Merge branch 'master'
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=f9849091bad2f9af7c7eb38c147144c74c534c5d;hp=9a194863f5519a0afc587271ce404c01c50c434e

Merge branch 'master'

Conflicts:
	src/mod-hostserv.c
---

diff --git a/configure.in b/configure.in
index b1f491d..a3a8851 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to create a configure script.
 dnl General initialization.
 AC_PREREQ(2.64)
 AC_INIT([srvx],[1.4.0-rc3],[srvx-bugs@lists.sourceforge.net])
-CODENAME=nextirc
+CODENAME=wgn
 AC_CONFIG_HEADERS(src/config.h)
 AC_CONFIG_SRCDIR(src/opserv.c)
 dnl AM_CANONICAL_TARGET must be before AM_INIT_AUTOMAKE() or autoconf whines
diff --git a/src/chanserv.c b/src/chanserv.c
index 0ebed1b..887b95a 100644
--- a/src/chanserv.c
+++ b/src/chanserv.c
@@ -2382,7 +2382,7 @@ static CHANSERV_FUNC(cmd_move)
 
     REQUIRE_PARAMS(2);
 
-    if(IsProtected(channel->channel_info) && !IsOper(user))
+    if(IsProtected(channel->channel_info))
     {
         reply("CSMSG_MOVE_NODELETE", channel->name);
         return 0;
@@ -2690,7 +2690,7 @@ static CHANSERV_FUNC(cmd_merge)
         return 0;
     }
 
-    if(IsProtected(channel->channel_info) && !IsOper(user))
+    if(IsProtected(channel->channel_info))
     {
         reply("CSMSG_MERGE_NODELETE");
         return 0;
@@ -5409,7 +5409,7 @@ static CHANSERV_FUNC(cmd_csuspend)
 
     REQUIRE_PARAMS(3);
 
-    if(IsProtected(channel->channel_info) && !IsOper(user))
+    if(IsProtected(channel->channel_info))
     {
         reply("CSMSG_SUSPEND_NODELETE", channel->name);
         return 0;
diff --git a/src/mod-hostserv.c b/src/mod-hostserv.c
index 7c09463..5e30ed9 100644
--- a/src/mod-hostserv.c
+++ b/src/mod-hostserv.c
@@ -1190,7 +1190,7 @@ static MODCMD_FUNC(cmd_oset) {
         reply("HSMSG_ACCESS_DENIED");
         return 0;
     }
-    if(!strcmp(argv[2], "*")) {
+    if(!strcmp(fakehost, "*")) {
         if(!assignment)
             return 0; //simply ignore (there is no assignment in use)
         hs_activate_assignment(hs_user, NULL);
diff --git a/src/modcmd.c b/src/modcmd.c
index 8736244..2ec8c6f 100644
--- a/src/modcmd.c
+++ b/src/modcmd.c
@@ -1943,7 +1943,7 @@ static MODCMD_FUNC(cmd_version) {
     if (argc > 1)
         send_message_type(4, user, cmd->parent->bot, "%s", git_version);
     else
-        send_message_type(12, user, cmd->parent->bot, "The srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net.\nThis version has been modified by pk910 - visit #srvx @ irc.nextirc.net.");
+        send_message_type(12, user, cmd->parent->bot, "The srvx Development Team includes Paul Chang, Adrian Dewhurst, Miles Peterson, Michael Poole and others.\nThe srvx Development Team can be reached at http://sf.net/projects/srvx/ or in #srvx on irc.gamesurge.net.\nThis version has been modified by pk910 - visit #srvx @ irc.webgamesnet.net.");
     return 1;
 }