openbsd-ports/net/silc-server/patches/operops-patch-apps_silcd_command_c

$OpenBSD: operops-patch-apps_silcd_command_c,v 1.5 2008/09/26 21:17:57 brad Exp $
--- apps/silcd/command.c.orig	Thu Sep 25 07:09:27 2008
+++ apps/silcd/command.c	Thu Sep 25 13:24:09 2008
@@ -3498,6 +3498,8 @@ SILC_SERVER_CMD_FUNC(cumode)
 						  TRUE, NULL);
 
   if (target_client != client &&
+      !(client->mode & SILC_UMODE_SERVER_OPERATOR) &&
+      !(client->mode & SILC_UMODE_ROUTER_OPERATOR) &&
       !(sender_mask & SILC_CHANNEL_UMODE_CHANFO) &&
       !(sender_mask & SILC_CHANNEL_UMODE_CHANOP)) {
     tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);
@@ -3621,7 +3623,9 @@ SILC_SERVER_CMD_FUNC(cumode)
     /* Promote to operator */
     if (!(chl->mode & SILC_CHANNEL_UMODE_CHANOP)) {
       if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&
-          !(sender_mask & SILC_CHANNEL_UMODE_CHANFO)) {
+          !(sender_mask & SILC_CHANNEL_UMODE_CHANFO) &&
+          !(client->mode & SILC_UMODE_SERVER_OPERATOR) &&
+          !(client->mode & SILC_UMODE_ROUTER_OPERATOR)) {
 	tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);
         silc_server_command_send_status_data(cmd, SILC_COMMAND_CUMODE,
 					     SILC_STATUS_ERR_NO_CHANNEL_PRIV,
@@ -3635,7 +3639,9 @@ SILC_SERVER_CMD_FUNC(cumode)
   } else {
     if (chl->mode & SILC_CHANNEL_UMODE_CHANOP) {
       if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&
-          !(sender_mask & SILC_CHANNEL_UMODE_CHANFO)) {
+          !(sender_mask & SILC_CHANNEL_UMODE_CHANFO) &&
+          !(client->mode & SILC_UMODE_SERVER_OPERATOR) &&
+          !(client->mode & SILC_UMODE_ROUTER_OPERATOR)) {
 	tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);
         silc_server_command_send_status_data(cmd, SILC_COMMAND_CUMODE,
 					     SILC_STATUS_ERR_NO_CHANNEL_PRIV,
Update to silc-server 1.1.13; bug fix update. ok johan@ 2008-09-26 17:17:57 -04:00			$OpenBSD: operops-patch-apps_silcd_command_c,v 1.5 2008/09/26 21:17:57 brad Exp $
			`--- apps/silcd/command.c.orig Thu Sep 25 07:09:27 2008`
			`+++ apps/silcd/command.c Thu Sep 25 13:24:09 2008`
			`@@ -3498,6 +3498,8 @@ SILC_SERVER_CMD_FUNC(cumode)`
SECURITY update: fixes possible buffer overflow in PKCS#1 message decoding. Version update 1.0 -> 1.1 as tested by several people. 2008-03-22 19:06:50 -04:00			`TRUE, NULL);`
incorporate patches from Dragos Ruiu as a FLAVOR which allow a SILC operator to give themselves operator status on any channel. 2003-08-18 23:52:27 -04:00
			`if (target_client != client &&`
			`+ !(client->mode & SILC_UMODE_SERVER_OPERATOR) &&`
			`+ !(client->mode & SILC_UMODE_ROUTER_OPERATOR) &&`
			`!(sender_mask & SILC_CHANNEL_UMODE_CHANFO) &&`
			`!(sender_mask & SILC_CHANNEL_UMODE_CHANOP)) {`
SECURITY update: fixes possible buffer overflow in PKCS#1 message decoding. Version update 1.0 -> 1.1 as tested by several people. 2008-03-22 19:06:50 -04:00			`tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);`
Update to silc-server 1.1.13; bug fix update. ok johan@ 2008-09-26 17:17:57 -04:00			`@@ -3621,7 +3623,9 @@ SILC_SERVER_CMD_FUNC(cumode)`
incorporate patches from Dragos Ruiu as a FLAVOR which allow a SILC operator to give themselves operator status on any channel. 2003-08-18 23:52:27 -04:00			`/* Promote to operator */`
			`if (!(chl->mode & SILC_CHANNEL_UMODE_CHANOP)) {`
upgrade to silc-server 0.9.14 - takeover as MAINTAINER -- ok MAINTAINER 2003-10-28 23:12:47 -05:00			`if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&`
incorporate patches from Dragos Ruiu as a FLAVOR which allow a SILC operator to give themselves operator status on any channel. 2003-08-18 23:52:27 -04:00			`- !(sender_mask & SILC_CHANNEL_UMODE_CHANFO)) {`
			`+ !(sender_mask & SILC_CHANNEL_UMODE_CHANFO) &&`
			`+ !(client->mode & SILC_UMODE_SERVER_OPERATOR) &&`
upgrade to silc-server 0.9.14 - takeover as MAINTAINER -- ok MAINTAINER 2003-10-28 23:12:47 -05:00			`+ !(client->mode & SILC_UMODE_ROUTER_OPERATOR)) {`
SECURITY update: fixes possible buffer overflow in PKCS#1 message decoding. Version update 1.0 -> 1.1 as tested by several people. 2008-03-22 19:06:50 -04:00			`tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);`
			`silc_server_command_send_status_data(cmd, SILC_COMMAND_CUMODE,`
upgrade to silc-server 0.9.14 - takeover as MAINTAINER -- ok MAINTAINER 2003-10-28 23:12:47 -05:00			`SILC_STATUS_ERR_NO_CHANNEL_PRIV,`
Update to silc-server 1.1.13; bug fix update. ok johan@ 2008-09-26 17:17:57 -04:00			`@@ -3635,7 +3639,9 @@ SILC_SERVER_CMD_FUNC(cumode)`
incorporate patches from Dragos Ruiu as a FLAVOR which allow a SILC operator to give themselves operator status on any channel. 2003-08-18 23:52:27 -04:00			`} else {`
			`if (chl->mode & SILC_CHANNEL_UMODE_CHANOP) {`
			`if (!(sender_mask & SILC_CHANNEL_UMODE_CHANOP) &&`
			`- !(sender_mask & SILC_CHANNEL_UMODE_CHANFO)) {`
			`+ !(sender_mask & SILC_CHANNEL_UMODE_CHANFO) &&`
			`+ !(client->mode & SILC_UMODE_SERVER_OPERATOR) &&`
upgrade to silc-server 0.9.14 - takeover as MAINTAINER -- ok MAINTAINER 2003-10-28 23:12:47 -05:00			`+ !(client->mode & SILC_UMODE_ROUTER_OPERATOR)) {`
SECURITY update: fixes possible buffer overflow in PKCS#1 message decoding. Version update 1.0 -> 1.1 as tested by several people. 2008-03-22 19:06:50 -04:00			`tmp_ch_id = silc_argument_get_arg_type(cmd->args, 1, &tmp_ch_len);`
upgrade to silc-server 0.9.14 - takeover as MAINTAINER -- ok MAINTAINER 2003-10-28 23:12:47 -05:00			`silc_server_command_send_status_data(cmd, SILC_COMMAND_CUMODE,`
			`SILC_STATUS_ERR_NO_CHANNEL_PRIV,`