Merge with upstream

This commit is contained in:
Dolf Schimmel (Freeaqingme)
2015-11-24 17:49:00 +01:00
parent 0c9e549560
commit 01964e5391

View File

@@ -212,7 +212,7 @@ func GobDecode(buf []byte, data interface{}) error {
func Go_xxfi_connect(ctx *C.SMFICTX, hostname *C.char, hostaddr *C._SOCK_ADDR) (sfsistat C.sfsistat) { func Go_xxfi_connect(ctx *C.SMFICTX, hostname *C.char, hostaddr *C._SOCK_ADDR) (sfsistat C.sfsistat) {
defer func(sfsistat *C.sfsistat) { defer func(sfsistat *C.sfsistat) {
if r := recover(); r != nil { if r := recover(); r != nil {
LoggerPrintf("Panic caught in Go_xxfi_connect(): %s", r) logger.Printf("Panic caught in Go_xxfi_connect(): %s", r)
*sfsistat = 75 // tempfail *sfsistat = 75 // tempfail
} }
}(&sfsistat) }(&sfsistat)