[srvx-commits] CVS: services/src modcmd.c,1.37,1.38

[Entrope <en...@us...>]

Update of /cvsroot/srvx/services/src
In directory usw-pr-cvs1:/tmp/cvs-serv14505/src

Modified Files:
	modcmd.c 
Log Message:
set effective flags after copying rule flags from one command to another


Index: modcmd.c
===================================================================
RCS file: /cvsroot/srvx/services/src/modcmd.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** modcmd.c	31 Oct 2002 03:40:08 -0000	1.37
--- modcmd.c	12 Nov 2002 20:18:56 -0000	1.38
***************
*** 249,252 ****
--- 249,263 ----
  
  static void
+ modcmd_set_effective_flags(struct svccmd *cmd) {
+     int flags = cmd->flags | cmd->command->flags;
+     if (cmd->min_opserv_level > 0) flags |= MODCMD_REQUIRE_OPER;
+     if (cmd->min_channel_access > ulNone) flags |= MODCMD_REQUIRE_CHANUSER;
+     if (flags & MODCMD_REQUIRE_CHANUSER) flags |= MODCMD_REQUIRE_REGCHAN;
+     if (flags & MODCMD_REQUIRE_JOINABLE) flags |= MODCMD_REQUIRE_CHANNEL;
+     if (flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING)) flags |= MODCMD_REQUIRE_AUTHED;
+     cmd->effective_flags = flags;
+ }
+ 
+ static void
  svccmd_copy_rules(struct svccmd *dest, struct svccmd *src) {
      dest->flags |= src->flags;
***************
*** 262,265 ****
--- 273,277 ----
          dest->min_channel_access = src->min_channel_access;
      }
+     modcmd_set_effective_flags(dest);
  }
  
***************
*** 359,373 ****
          return 0;
      }
- }
- 
- static void
- modcmd_set_effective_flags(struct svccmd *cmd) {
-     int flags = cmd->flags | cmd->command->flags;
-     if (cmd->min_opserv_level > 0) flags |= MODCMD_REQUIRE_OPER;
-     if (cmd->min_channel_access > ulNone) flags |= MODCMD_REQUIRE_CHANUSER;
-     if (flags & MODCMD_REQUIRE_CHANUSER) flags |= MODCMD_REQUIRE_REGCHAN;
-     if (flags & MODCMD_REQUIRE_JOINABLE) flags |= MODCMD_REQUIRE_CHANNEL;
-     if (flags & (MODCMD_REQUIRE_STAFF|MODCMD_REQUIRE_HELPING)) flags |= MODCMD_REQUIRE_AUTHED;
-     cmd->effective_flags = flags;
  }
  
--- 371,374 ----