CEF/ergo
1
0
Fork 0
forked from External/ergo
Code Pull requests Activity

fix #1194

Browse source
This commit is contained in:
Shivaram Lingamneni 2020-10-09 08:03:26 -04:00
parent 3cd0e40146
commit 78b2f61707
6 changed files with 34 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
irc/config.go
View file

@ -419,6 +419,7 @@ type OperConfig struct {
Fingerprint *string // legacy name for certfp, #1050
Certfp string
Auto bool
Hidden bool
Modes string
}
@ -723,9 +724,15 @@ type Oper struct {
Pass []byte
Certfp string
Auto bool
Hidden bool
Modes []modes.ModeChange
}
// returns whether this is a publicly visible operator, for WHO/WHOIS purposes
func (oper *Oper) Visible(hasPrivs bool) bool {
return oper != nil && (hasPrivs || !oper.Hidden)
}
// Operators returns a map of operator configs from the given OperClass and config.
func (conf *Config) Operators(oc map[string]*OperClass) (map[string]*Oper, error) {
operators := make(map[string]*Oper)
@ -756,6 +763,7 @@ func (conf *Config) Operators(oc map[string]*OperClass) (map[string]*Oper, error
}
}
oper.Auto = opConf.Auto
oper.Hidden = opConf.Hidden
if oper.Pass == nil && oper.Certfp == "" {
return nil, fmt.Errorf("Oper %s has neither a password nor a fingerprint", name)