rebase fixes

netclient/daemon/common.go

@@ -47,26 +47,6 @@ func Restart() error {
 	return nil
 }
 
-//	os := runtime.GOOS
-//	var err error
-//
-//	time.Sleep(time.Second)
-//
-//	switch os {
-//	case "windows":
-//		RestartWindowsDaemon()
-//	case "darwin":
-//		RestartLaunchD()
-//	case "linux":
-//		RestartSystemD()
-//	case "freebsd":
-//		FreebsdDaemon("restart")
-//	default:
-//		err = errors.New("this os is not yet supported for daemon mode. Run join cmd with flag '--daemon off'")
-//	}
-//	return err
-//}
-
 // Stop - stops a system daemon
 func Stop() error {
 	os := runtime.GOOS

netclient/functions/daemon.go

@@ -44,40 +44,40 @@ func Daemon() error {
 	UpdateClientConfig()
 	if err := ncutils.SavePID(); err != nil {
 		return err
-		serverSet := make(map[string]bool)
-		// == initial pull of all networks ==
-		networks, _ := ncutils.GetSystemNetworks()
-		if len(networks) == 0 {
-			return errors.New("no networks")
-		}
-		// set ipforwarding on startup
-		err := local.SetIPForwarding()
-		if err != nil {
-			logger.Log(0, err.Error())
-		}
+	}
+	serverSet := make(map[string]bool)
+	// == initial pull of all networks ==
+	networks, _ := ncutils.GetSystemNetworks()
+	if len(networks) == 0 {
+		return errors.New("no networks")
+	}
+	// set ipforwarding on startup
+	err := local.SetIPForwarding()
+	if err != nil {
+		logger.Log(0, err.Error())
+	}
 
-		// == add waitgroup and cancel for checkin routine ==
-		wg := sync.WaitGroup{}
-		quit := make(chan os.Signal, 1)
-		reset := make(chan os.Signal, 1)
-		signal.Notify(quit, syscall.SIGTERM, os.Interrupt)
-		signal.Notify(reset, syscall.SIGHUP)
-		cancel := startServerGoRoutines(&wg)
-		for {
-			select {
-			case <-quit:
-				cancel()
-				logger.Log(0, "shutting down netclient daemon")
-				wg.Wait()
-				logger.Log(0, "shutdown complete")
-				return nil
-			case <-reset:
-				logger.Log(0, "received reset")
-				cancel()
-				wg.Wait()
-				logger.Log(0, "restarting daemon")
-				cancel = startServerGoRoutines(&wg)
-			}
+	// == add waitgroup and cancel for checkin routine ==
+	wg := sync.WaitGroup{}
+	quit := make(chan os.Signal, 1)
+	reset := make(chan os.Signal, 1)
+	signal.Notify(quit, syscall.SIGTERM, os.Interrupt)
+	signal.Notify(reset, syscall.SIGHUP)
+	cancel := startServerGoRoutines(&wg)
+	for {
+		select {
+		case <-quit:
+			cancel()
+			logger.Log(0, "shutting down netclient daemon")
+			wg.Wait()
+			logger.Log(0, "shutdown complete")
+			return nil
+		case <-reset:
+			logger.Log(0, "received reset")
+			cancel()
+			wg.Wait()
+			logger.Log(0, "restarting daemon")
+			cancel = startServerGoRoutines(&wg)
 		}
 	}
 }

tls/tls.go

@@ -120,13 +120,11 @@ func NewCName(commonName string) pkix.Name {
 }
 
 // NewCSR creates a new certificate signing request for a
-func NewCSR(key ed25519.PrivateKey, names ...pkix.Name) (*x509.CertificateRequest, error) {
+func NewCSR(key ed25519.PrivateKey, name pkix.Name) (*x509.CertificateRequest, error) {
 	dnsnames := []string{}
-	for _, name := range names {
-		dnsnames = append(dnsnames, name.CommonName)
-	}
+	dnsnames = append(dnsnames, name.CommonName)
 	derCertRequest, err := x509.CreateCertificateRequest(rand.Reader, &x509.CertificateRequest{
-		Subject:            names[0],
+		Subject:            name,
 		PublicKey:          key.Public(),
 		DNSNames:           dnsnames,
 		PublicKeyAlgorithm: x509.Ed25519,