Merge branch 'master' of git.wrede.ca:andreas/heartbeat

sequence

hbd

@@ -34,6 +34,8 @@ from subprocess import Popen, STDOUT, PIPE
 import hbdclass
 
 
+NSUPDATE_BIN = "/usr/local/bin/nsupdate"		# override in .hbrc possible
+
 SEND_EMAIL=False
 SEND_PUSHOVER=True
 
@@ -275,7 +277,7 @@ answer
 """ % D
 
 	if DEBUG > 0: log(None, "DBG: nsup %s" % nsup)
-	cmd = ["/usr/local/bin/nsupdate", "-k", "/etc/dhcpc/K%(domain)s.+157+00000." % D, "-v"]
+	cmd = [nsupdate_bin, "-k", "/etc/dhcpc/K%(domain)s.+157+00000." % D, "-v"]
 	if DEBUG > 0: log(None, "DBG: cmd %s" % cmd)
 	try:
 		p = Popen(cmd, shell=False, bufsize=1, stdin=PIPE, stdout=PIPE, stderr=STDOUT)
@@ -285,9 +287,9 @@ answer
 		return "nsupdate: some error occured"
 
 	(output, err) = p.communicate(nsup.encode())
-	if output.find('status: NOERROR') >= 0:
+	if output.decode().find('status: NOERROR') >= 0:
 		return None
-	return output
+	return output.decode()
 
 
 #
@@ -880,6 +882,7 @@ grace = GRACE
 watchhosts = []
 dyndnshosts = []
 drophosts = []
+nsupdate_bin = NSUPDATE_BIN
 
 try:
 	f = open(configfile, "r")
@@ -928,6 +931,8 @@ if f:
 			dyndnshosts = a
 		elif o == 'drophosts':
 			drophosts = a
+		elif o == 'nsupdate_bin':
+			nsupdate_bin = a
 	f.close()
 
 if len(args) != 0: