From 72a94cab0040ffd2a76b303224d2c4f805303bf0 Mon Sep 17 00:00:00 2001
From: Solderpunk <solderpunk@posteo.net>
Date: Sat, 4 Mar 2023 14:27:01 +0100
Subject: [PATCH] Restore Go 1.15 compatibility.

---
 launch.go              |  4 ++--
 security_oldgolinux.go | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/launch.go b/launch.go
index 3bbee89..5c14d52 100644
--- a/launch.go
+++ b/launch.go
@@ -4,7 +4,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"encoding/pem"
-	"io"
+	"io/ioutil"
 	"log"
 	"os"
 	"os/signal"
@@ -65,7 +65,7 @@ func launch(sysConfig SysConfig, userConfig UserConfig, privInfo userInfo) int {
 		log.Println("Error opening TLS certificate file: " + err.Error())
 		return 1
 	}
-	certBytes, err := io.ReadAll(certFile)
+	certBytes, err := ioutil.ReadAll(certFile)
 	if err != nil {
 		log.Println("Error reading TLS certificate file: " + err.Error())
 		return 1
diff --git a/security_oldgolinux.go b/security_oldgolinux.go
index 88eb1c1..d2af03b 100644
--- a/security_oldgolinux.go
+++ b/security_oldgolinux.go
@@ -3,10 +3,19 @@
 package main
 
 import (
+	"errors"
 	"log"
 	"os"
 )
 
+type userInfo struct {
+}
+
+func getUserInfo(unprivUser string) (userInfo, error) {
+       var dummy userInfo
+       return dummy, nil
+}
+
 func enableSecurityRestrictions(config SysConfig, ui userInfo) error {
 
 	// Prior to Go 1.6, setuid did not work reliably on Linux
@@ -16,7 +25,7 @@ func enableSecurityRestrictions(config SysConfig, ui userInfo) error {
 	if uid == 0 || euid == 0 {
 		setuid_err := "Refusing to run with root privileges when setuid() will not work!"
 		log.Println(setuid_err)
-		return error.New(setuid_err)
+		return errors.New(setuid_err)
 	}
 
 	return nil