Merge pull request #481 from nkryuchkov/fix/enable-linter

Enable linter in TravisCI

.travis.yml

@@ -25,7 +25,7 @@ before_script:
   - ci_scripts/create-ip-aliases.sh
 
 script:
-#  - make lint TODO(evanlinjin): Temporary due to https://github.com/golangci/golangci-lint/issues/827
+  - make lint # TODO(evanlinjin): Temporary due to https://github.com/golangci/golangci-lint/issues/827
   - make test
   - make test-no-ci
   - make install-deps-ui

internal/vpn/os_client_linux.go

@@ -63,15 +63,15 @@ func setupClientSysPrivileges() (suid int, err error) {
 
 		// set `CAP_NET_ADMIN` capability to needed caps sets.
 		caps.Set(capability.CAPS|capability.BOUNDS|capability.AMBIENT, capability.CAP_NET_ADMIN)
-		if err := caps.Apply(capability.CAPS | capability.BOUNDS | capability.AMBIENT); err != nil {
-			err = fmt.Errorf("failed to apply capabilties: %w", err)
+		if e := caps.Apply(capability.CAPS | capability.BOUNDS | capability.AMBIENT); e != nil {
+			err = fmt.Errorf("failed to apply capabilties: %w", e)
 			return
 		}
 
 		// let child process keep caps sets from the parent, so we may do calls to
 		// system utilities with these caps.
-		if err := unix.Prctl(unix.PR_SET_KEEPCAPS, 1, 0, 0, 0); err != nil {
-			err = fmt.Errorf("failed to set PR_SET_KEEPCAPS: %w", err)
+		if e := unix.Prctl(unix.PR_SET_KEEPCAPS, 1, 0, 0, 0); e != nil {
+			err = fmt.Errorf("failed to set PR_SET_KEEPCAPS: %w", e)
 			return
 		}
 	})