Merge branch 'master'

Conflicts:
	src/mod-hostserv.c

diff --git a/configure.in b/configure.in
index b1f491dcae7e83fb78005a50db0714477d73e722..a3a885165a080b602c80af02da02b311a5ace647 100644 (file)
--- 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 0ebed1b8d33504c411a1c85bb506e934fe751337..887b95aaa3c4e8ffb8b40ed44f42d253894bf04a 100644 (file)
--- 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 7c09463e3ef8022f7f4ffb53057a80e657f177b4..5e30ed9f929e6ae1b08205da09a3ee41b4c33641 100644 (file)
--- 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 873624439a3aff4712824f27f17810c6dac135ee..2ec8c6f81cd1298c17204702460b932b687fe61f 100644 (file)
--- 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;
 }