From 7cb3717176da357e72f84d17f542f252a54caa95 Mon Sep 17 00:00:00 2001 From: Andreas Wrede Date: Wed, 15 Jan 2020 16:38:42 -0500 Subject: [PATCH] make nsupdate bin configurable --- hbd | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hbd b/hbd index a0d286f..192a7bc 100755 --- a/hbd +++ b/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 @@ -241,7 +243,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) @@ -251,9 +253,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() # @@ -826,6 +828,7 @@ grace = GRACE watchhosts = [] dyndnshosts = [] drophosts = [] +nsupdate_bin = NSUPDATE_BIN try: f = open(configfile, "r") @@ -874,6 +877,8 @@ if f: dyndnshosts = a elif o == 'drophosts': drophosts = a + elif o == 'nsupdate_bin': + nsupdate_bin = a f.close() if len(args) != 0: