diff options
| author | Paul Buetow <pbuetow@mimecast.com> | 2020-03-06 18:48:13 +0000 |
|---|---|---|
| committer | Paul Buetow <pbuetow@mimecast.com> | 2020-03-06 18:48:13 +0000 |
| commit | 427e5c14454804c28bd6fa2205bb4121f52c1fbd (patch) | |
| tree | 6ba857b2184c3b09401845a6dff67224cfbe1417 | |
| parent | dac4449cfb308819b5c44c3895d5a83228eeaf16 (diff) | |
| parent | a4f8e0926a1a6888cbab1cfd94229cf1cc5cba7d (diff) | |
merge master
| -rw-r--r-- | doc/logo-large.png | bin | 0 -> 22726 bytes | |||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 | ||||
| -rw-r--r-- | internal/config/common.go | 9 | ||||
| -rw-r--r-- | internal/server/server.go | 8 | ||||
| -rw-r--r-- | samples/dtail.json.sample | 3 |
6 files changed, 13 insertions, 11 deletions
diff --git a/doc/logo-large.png b/doc/logo-large.png Binary files differnew file mode 100644 index 0000000..cef5eb9 --- /dev/null +++ b/doc/logo-large.png @@ -5,5 +5,5 @@ go 1.13 require ( github.com/DataDog/zstd v1.4.4 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 - golang.org/x/lint v0.0.0-20200130185559-910be7a94367 // indirect + golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect ) @@ -6,6 +6,8 @@ golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876 h1:sKJQZMuxjOAR/Uo2LBfU90 golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/lint v0.0.0-20200130185559-910be7a94367 h1:0IiAsCRByjO2QjX7ZPkw5oU9x+n1YqRL802rjC0c3Aw= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= diff --git a/internal/config/common.go b/internal/config/common.go index a09a3ad..103b390 100644 --- a/internal/config/common.go +++ b/internal/config/common.go @@ -10,9 +10,12 @@ type CommonConfig struct { // stdout: only log to stdout (useful when used with systemd) // daily: create a log file for every day LogStrategy string - LogDir string - CacheDir string - TmpDir string `json:",omitempty"` + // The log directory + LogDir string + // The cache directory + CacheDir string + // The temp directory + TmpDir string `json:",omitempty"` } // Create a new default configuration. diff --git a/internal/server/server.go b/internal/server/server.go index eb0cdd7..8e791c8 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -264,15 +264,15 @@ func (s *Server) schedueleUserCanHaveSSHSession(addr string, user *user.User, jo continue } for _, myAddr := range job.AllowFrom { - myIps, err := net.LookupIP(myAddr) + myIPs, err := net.LookupIP(myAddr) if err != nil { logger.Error(user, myAddr, err) continue } - for _, myIp := range myIps { - logger.Debug("schedueleUserCanHaveSSHSession", "Comparing IP addresses", ip, myIp.String()) - if ip == myIp.String() { + for _, myIP := range myIPs { + logger.Debug("schedueleUserCanHaveSSHSession", "Comparing IP addresses", ip, myIP.String()) + if ip == myIP.String() { return true } } diff --git a/samples/dtail.json.sample b/samples/dtail.json.sample index 6e76c9d..fa799ce 100644 --- a/samples/dtail.json.sample +++ b/samples/dtail.json.sample @@ -34,9 +34,6 @@ "LogStrategy": "stdout", "SSHPort": 2222, "DebugEnable": false, - "PPerfEnable": false, - "PPerfPort": 6060, - "PPerfBindAddress": "0.0.0.0", "ExperimentalFeaturesEnable": false } } |
