From df78914cae2dc2e3da5170cf3f9c7b412aed3afa Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@sbcglobal.net>
Date: Thu, 3 Sep 2015 16:59:14 -0600
Subject: Use a defer/recover block to have the exit status on panic match LSB.

---
 src/nshd/hackers_git/hackers.go | 2 ++
 src/nshd/main.go                | 2 ++
 2 files changed, 4 insertions(+)

(limited to 'src/nshd')

diff --git a/src/nshd/hackers_git/hackers.go b/src/nshd/hackers_git/hackers.go
index ecbda7a..814e921 100644
--- a/src/nshd/hackers_git/hackers.go
+++ b/src/nshd/hackers_git/hackers.go
@@ -6,6 +6,7 @@ import (
 	"nslcd_proto/util"
 	"nslcd_systemd"
 	"sd_daemon/logger"
+	"sd_daemon/lsb"
 	"sync"
 )
 
@@ -47,6 +48,7 @@ func NewHackers(config Config) *Hackers {
 	}
 	o.workers.Add(1)
 	go func() {
+		defer lsb.Recover()
 		defer o.workers.Done()
 		o.worker()
 	}()
diff --git a/src/nshd/main.go b/src/nshd/main.go
index ebca1a6..bc53711 100644
--- a/src/nshd/main.go
+++ b/src/nshd/main.go
@@ -1,12 +1,14 @@
 package main
 
 import (
+	"sd_daemon/lsb"
 	"nshd/hackers_git"
 	"nslcd_systemd"
 	"os"
 )
 
 func main() {
+	defer lsb.Recover()
 	config := hackers_git.Config{
 		Pam_password_prohibit_message: "",
 		Yamldir: "/var/cache/parabola-hackers/users",
-- 
cgit v1.2.3-54-g00ecf