Minor bug fixes

netlore · netlore · commit 6c48c20aabb5 · 2020-10-01T00:53:25.000+01:00
diff --git a/bin/openakc-functions b/bin/openakc-functions
@@ -69,8 +69,7 @@ data_validateroles () {
   exec 6<>"$fnd"
   [[ $? -eq 0 ]]&&logdebug "Default roles file \"$fnd\" opened OK"
  else
-# FIXME - having no role file (yet?) is not an error
-  returnval["reply"]="ERR: Backend Failure Reading Roles Data"
+  returnval["reply"]="OK: Authentication failed (no matching key)"
   return 1
  fi
 #
diff --git a/bin/openakc-server b/bin/openakc-server
@@ -75,7 +75,8 @@ PRVKEY="openakc-system-server-$(hostid)-prvkey.pem"
 PUBKEY="openakc-system-server-$(hostid)-pubkey.pem"
 SESSKEY=""
 PROTO="0"
-# REMOTE_HOST defined by xinetd.
+# REMOTE_HOST defined by xinetd, REMOTE_ADDR by systemd.
+[ "x$REMOTE_HOST" == "x" ]&&REMOTE_HOST="$REMOTE_ADDR"
 REMOTE_HOST="${REMOTE_HOST//::ffff:/}"
 
 #

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ PRVKEY="openakc-system-server-$(hostid)-prvkey.pem"`
`75`	`75`	`PUBKEY="openakc-system-server-$(hostid)-pubkey.pem"`
`76`	`76`	`SESSKEY=""`
`77`	`77`	`PROTO="0"`
`78`		`-# REMOTE_HOST defined by xinetd.`
	`78`	`+# REMOTE_HOST defined by xinetd, REMOTE_ADDR by systemd.`
	`79`	`+[ "x$REMOTE_HOST" == "x" ]&&REMOTE_HOST="$REMOTE_ADDR"`
`79`	`80`	`REMOTE_HOST="${REMOTE_HOST//::ffff:/}"`
`80`	`81`
`81`	`82`	`#`