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 | 5f40b7f3ddfb945e87733fa9877bf0d6f2e62b4e (patch) | |
| tree | 6ba857b2184c3b09401845a6dff67224cfbe1417 /internal | |
| parent | 2a6e9485b45f9c6181b72306ba08481e9f3f80e9 (diff) | |
| parent | c3c76df50f2e1c784d938e3750b24f20cd4a5c8d (diff) | |
merge master
Diffstat (limited to 'internal')
| -rw-r--r-- | internal/config/common.go | 9 | ||||
| -rw-r--r-- | internal/server/server.go | 8 |
2 files changed, 10 insertions, 7 deletions
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 } } |
