External/ergo
1
0
Fork 1
mirror of https://github.com/ergochat/ergo.git synced 2025-12-20 02:00:11 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	ergonomadic.go
	irc/config.go
	irc/server.go
This commit is contained in:
Jeremy Latt 2014-03-02 11:41:24 -08:00
commit fa165a9d74
7 changed files with 91 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
irc/config.go
View file

@ -2,7 +2,6 @@ package irc
import (
"code.google.com/p/gcfg"
"encoding/base64"
"errors"
"log"
)
@ -12,10 +11,7 @@ type PassConfig struct {
}
func (conf *PassConfig) PasswordBytes() []byte {
if conf.Password == "" {
return nil
}
bytes, err := base64.StdEncoding.DecodeString(conf.Password)
bytes, err := DecodePassword(conf.Password)
if err != nil {
log.Fatal(err)
}