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

ircd: implement GRANT subsystem based on ircd-seven

Browse source
This commit is contained in:
William Pitcock 2016-01-11 23:02:03 -06:00
parent cd66c5b922
commit fe749d3709
7 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/ircd.conf.example
View file

@ -239,7 +239,7 @@ privset "global_op" {
privset "admin" { privset "admin" {
extends = "global_op"; extends = "global_op";
privs = oper:admin, oper:die, oper:rehash, oper:spy; privs = oper:admin, oper:die, oper:rehash, oper:spy, oper:grant;
}; };
operator "god" { operator "god" {

4
doc/reference.conf
View file

@ -431,6 +431,7 @@ privset "local_op" {
* oper:hidden: hides the oper from /stats p * oper:hidden: hides the oper from /stats p
* oper:remoteban: allows remote kline etc * oper:remoteban: allows remote kline etc
* oper:mass_notice: allows sending wallops and mass notices * oper:mass_notice: allows sending wallops and mass notices
* oper:grant: allows using the GRANT command
*/ */
privs = oper:local_kill, oper:operwall; privs = oper:local_kill, oper:operwall;
}; };
@ -449,7 +450,7 @@ privset "global_op" {
privset "admin" { privset "admin" {
extends = "global_op"; extends = "global_op";
privs = oper:admin, oper:die, oper:rehash, oper:spy; privs = oper:admin, oper:die, oper:rehash, oper:spy, oper:grant;
}; };
/* operator {}: defines ircd operators. (OLD O:) */ /* operator {}: defines ircd operators. (OLD O:) */
@ -667,6 +668,7 @@ shared {
* dline - allow setting perm/temp dlines * dline - allow setting perm/temp dlines
* tdline - allow setting temp dlines * tdline - allow setting temp dlines
* undline - allow removing dlines * undline - allow removing dlines
* grant - allow granting operator status
* none - disallow everything * none - disallow everything
*/ */

3
include/s_newconf.h
View file

@ -96,10 +96,11 @@ struct remote_conf
#define SHARED_TDLINE 0x0800 #define SHARED_TDLINE 0x0800
#define SHARED_PDLINE 0x1000 #define SHARED_PDLINE 0x1000
#define SHARED_UNDLINE 0x2000 #define SHARED_UNDLINE 0x2000
#define SHARED_GRANT 0x4000
#define SHARED_ALL (SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\ #define SHARED_ALL (SHARED_TKLINE | SHARED_PKLINE | SHARED_UNKLINE |\
SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\ SHARED_PXLINE | SHARED_TXLINE | SHARED_UNXLINE |\
SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV) SHARED_TRESV | SHARED_PRESV | SHARED_UNRESV | SHARED_GRANT)
#define CLUSTER_ALL (SHARED_ALL | SHARED_LOCOPS) #define CLUSTER_ALL (SHARED_ALL | SHARED_LOCOPS)
/* flags used in hub/leaf */ /* flags used in hub/leaf */

1
ircd/newconf.c
View file

@ -388,6 +388,7 @@ static struct mode_table shared_table[] =
{ "unresv", SHARED_UNRESV }, { "unresv", SHARED_UNRESV },
{ "locops", SHARED_LOCOPS }, { "locops", SHARED_LOCOPS },
{ "rehash", SHARED_REHASH }, { "rehash", SHARED_REHASH },
{ "grant", SHARED_GRANT },
{ "all", SHARED_ALL }, { "all", SHARED_ALL },
{ "none", 0 }, { "none", 0 },
{NULL, 0} {NULL, 0}

1
modules/Makefile.am
View file

@ -24,6 +24,7 @@ auto_load_mod_LTLIBRARIES = \
m_dline.la \ m_dline.la \
m_encap.la \ m_encap.la \
m_etrace.la \ m_etrace.la \
m_grant.la \
m_help.la \ m_help.la \
m_info.la \ m_info.la \
m_invite.la \ m_invite.la \

36
modules/Makefile.in
View file

@ -226,6 +226,9 @@ m_encap_la_OBJECTS = m_encap.lo
m_etrace_la_LIBADD = m_etrace_la_LIBADD =
m_etrace_la_SOURCES = m_etrace.c m_etrace_la_SOURCES = m_etrace.c
m_etrace_la_OBJECTS = m_etrace.lo m_etrace_la_OBJECTS = m_etrace.lo
m_grant_la_LIBADD =
m_grant_la_SOURCES = m_grant.c
m_grant_la_OBJECTS = m_grant.lo
m_help_la_LIBADD = m_help_la_LIBADD =
m_help_la_SOURCES = m_help.c m_help_la_SOURCES = m_help.c
m_help_la_OBJECTS = m_help.lo m_help_la_OBJECTS = m_help.lo
@ -419,13 +422,13 @@ SOURCES = chm_nocolour.c chm_noctcp.c core/m_ban.c core/m_die.c \
core/m_quit.c core/m_server.c core/m_squit.c m_accept.c \ core/m_quit.c core/m_server.c core/m_squit.c m_accept.c \
m_admin.c m_away.c m_cap.c m_capab.c m_certfp.c m_challenge.c \ m_admin.c m_away.c m_cap.c m_capab.c m_certfp.c m_challenge.c \
m_chghost.c m_close.c m_cmessage.c m_connect.c m_dline.c \ m_chghost.c m_close.c m_cmessage.c m_connect.c m_dline.c \
m_encap.c m_etrace.c m_help.c m_info.c m_invite.c m_ison.c \ m_encap.c m_etrace.c m_grant.c m_help.c m_info.c m_invite.c \
m_kline.c m_knock.c m_links.c m_list.c m_locops.c m_lusers.c \ m_ison.c m_kline.c m_knock.c m_links.c m_list.c m_locops.c \
m_map.c m_monitor.c m_motd.c m_names.c m_oper.c m_operspy.c \ m_lusers.c m_map.c m_monitor.c m_motd.c m_names.c m_oper.c \
m_pass.c m_ping.c m_pong.c m_post.c m_privs.c m_rehash.c \ m_operspy.c m_pass.c m_ping.c m_pong.c m_post.c m_privs.c \
m_restart.c m_resv.c m_sasl.c m_scan.c m_services.c m_set.c \ m_rehash.c m_restart.c m_resv.c m_sasl.c m_scan.c m_services.c \
m_signon.c m_snote.c m_starttls.c m_stats.c m_svinfo.c m_tb.c \ m_set.c m_signon.c m_snote.c m_starttls.c m_stats.c m_svinfo.c \
m_testline.c m_testmask.c m_tginfo.c m_time.c m_topic.c \ m_tb.c m_testline.c m_testmask.c m_tginfo.c m_time.c m_topic.c \
m_trace.c m_unreject.c m_user.c m_userhost.c m_users.c \ m_trace.c m_unreject.c m_user.c m_userhost.c m_users.c \
m_version.c m_wallops.c m_who.c m_whois.c m_whowas.c m_xline.c \ m_version.c m_wallops.c m_who.c m_whois.c m_whowas.c m_xline.c \
sno_routing.c sno_routing.c
@ -435,13 +438,13 @@ DIST_SOURCES = chm_nocolour.c chm_noctcp.c core/m_ban.c core/m_die.c \
core/m_quit.c core/m_server.c core/m_squit.c m_accept.c \ core/m_quit.c core/m_server.c core/m_squit.c m_accept.c \
m_admin.c m_away.c m_cap.c m_capab.c m_certfp.c m_challenge.c \ m_admin.c m_away.c m_cap.c m_capab.c m_certfp.c m_challenge.c \
m_chghost.c m_close.c m_cmessage.c m_connect.c m_dline.c \ m_chghost.c m_close.c m_cmessage.c m_connect.c m_dline.c \
m_encap.c m_etrace.c m_help.c m_info.c m_invite.c m_ison.c \ m_encap.c m_etrace.c m_grant.c m_help.c m_info.c m_invite.c \
m_kline.c m_knock.c m_links.c m_list.c m_locops.c m_lusers.c \ m_ison.c m_kline.c m_knock.c m_links.c m_list.c m_locops.c \
m_map.c m_monitor.c m_motd.c m_names.c m_oper.c m_operspy.c \ m_lusers.c m_map.c m_monitor.c m_motd.c m_names.c m_oper.c \
m_pass.c m_ping.c m_pong.c m_post.c m_privs.c m_rehash.c \ m_operspy.c m_pass.c m_ping.c m_pong.c m_post.c m_privs.c \
m_restart.c m_resv.c m_sasl.c m_scan.c m_services.c m_set.c \ m_rehash.c m_restart.c m_resv.c m_sasl.c m_scan.c m_services.c \
m_signon.c m_snote.c m_starttls.c m_stats.c m_svinfo.c m_tb.c \ m_set.c m_signon.c m_snote.c m_starttls.c m_stats.c m_svinfo.c \
m_testline.c m_testmask.c m_tginfo.c m_time.c m_topic.c \ m_tb.c m_testline.c m_testmask.c m_tginfo.c m_time.c m_topic.c \
m_trace.c m_unreject.c m_user.c m_userhost.c m_users.c \ m_trace.c m_unreject.c m_user.c m_userhost.c m_users.c \
m_version.c m_wallops.c m_who.c m_whois.c m_whowas.c m_xline.c \ m_version.c m_wallops.c m_who.c m_whois.c m_whowas.c m_xline.c \
sno_routing.c sno_routing.c
@ -672,6 +675,7 @@ auto_load_mod_LTLIBRARIES = \
m_dline.la \ m_dline.la \
m_encap.la \ m_encap.la \
m_etrace.la \ m_etrace.la \
m_grant.la \
m_help.la \ m_help.la \
m_info.la \ m_info.la \
m_invite.la \ m_invite.la \
@ -949,6 +953,9 @@ m_encap.la: $(m_encap_la_OBJECTS) $(m_encap_la_DEPENDENCIES) $(EXTRA_m_encap_la_
m_etrace.la: $(m_etrace_la_OBJECTS) $(m_etrace_la_DEPENDENCIES) $(EXTRA_m_etrace_la_DEPENDENCIES) m_etrace.la: $(m_etrace_la_OBJECTS) $(m_etrace_la_DEPENDENCIES) $(EXTRA_m_etrace_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) -rpath $(auto_load_moddir) $(m_etrace_la_OBJECTS) $(m_etrace_la_LIBADD) $(LIBS) $(AM_V_CCLD)$(LINK) -rpath $(auto_load_moddir) $(m_etrace_la_OBJECTS) $(m_etrace_la_LIBADD) $(LIBS)
m_grant.la: $(m_grant_la_OBJECTS) $(m_grant_la_DEPENDENCIES) $(EXTRA_m_grant_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) -rpath $(auto_load_moddir) $(m_grant_la_OBJECTS) $(m_grant_la_LIBADD) $(LIBS)
m_help.la: $(m_help_la_OBJECTS) $(m_help_la_DEPENDENCIES) $(EXTRA_m_help_la_DEPENDENCIES) m_help.la: $(m_help_la_OBJECTS) $(m_help_la_DEPENDENCIES) $(EXTRA_m_help_la_DEPENDENCIES)
$(AM_V_CCLD)$(LINK) -rpath $(auto_load_moddir) $(m_help_la_OBJECTS) $(m_help_la_LIBADD) $(LIBS) $(AM_V_CCLD)$(LINK) -rpath $(auto_load_moddir) $(m_help_la_OBJECTS) $(m_help_la_LIBADD) $(LIBS)
@ -1126,6 +1133,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_dline.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_dline.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_encap.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_encap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_etrace.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_etrace.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_grant.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_help.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_help.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_info.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_info.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_invite.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/m_invite.Plo@am__quote@

1
modules/m_stats.c
View file

@ -1053,6 +1053,7 @@ static struct shared_flags shared_flagtable[] =
{ SHARED_TDLINE, 'd' }, { SHARED_TDLINE, 'd' },
{ SHARED_PDLINE, 'D' }, { SHARED_PDLINE, 'D' },
{ SHARED_UNDLINE, 'E' }, { SHARED_UNDLINE, 'E' },
{ SHARED_GRANT, 'G' },
{ 0, '\0'} { 0, '\0'}
}; };