Merge remote-tracking branch 'origin/master' into cleanup

Conflicts:
	irc/client.go
	irc/commands.go
	irc/constants.go
	irc/reply.go
	irc/server.go
	irc/types.go
This commit is contained in:
Jeremy Latt 2014-03-13 12:38:44 -07:00
commit 39b7c2a915
12 changed files with 323 additions and 268 deletions

View file

@ -31,10 +31,10 @@ type Config struct {
Operator map[string]*PassConfig
}
func (conf *Config) Operators() map[string][]byte {
operators := make(map[string][]byte)
func (conf *Config) Operators() map[Name][]byte {
operators := make(map[Name][]byte)
for name, opConf := range conf.Operator {
operators[name] = opConf.PasswordBytes()
operators[NewName(name)] = opConf.PasswordBytes()
}
return operators
}