aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml6
-rw-r--r--Makefile4
-rw-r--r--pam/pam.c3
3 files changed, 6 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml
index 309bcc2..eb2176a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
language: go
sudo: false
-dist: trusty
-go: 1.11.x
+dist: bionic
+go: 1.12.x
notifications:
email: false
@@ -39,7 +39,7 @@ jobs:
- make
- <<: *build
- go: 1.10.x
+ go: 1.11.x
- env: Integration Tests
sudo: required
diff --git a/Makefile b/Makefile
index 8c691a5..310be26 100644
--- a/Makefile
+++ b/Makefile
@@ -173,8 +173,8 @@ TOOLS := $(addprefix $(BIN)/,protoc golint protoc-gen-go goimports staticcheck g
tools: $(TOOLS)
$(BIN)/golint:
- GO111MODULE=off go get github.com/golang/lint/golint
- GO111MODULE=off go build -o $@ github.com/golang/lint/golint
+ GO111MODULE=off go get golang.org/x/lint/golint
+ GO111MODULE=off go build -o $@ golang.org/x/lint/golint
$(BIN)/protoc-gen-go:
GO111MODULE=off go get -d github.com/golang/protobuf/protoc-gen-go
git -C "$(shell go env GOPATH)/src/github.com/golang/protobuf" checkout v1.2.0
diff --git a/pam/pam.c b/pam/pam.c
index 4769705..bb16427 100644
--- a/pam/pam.c
+++ b/pam/pam.c
@@ -19,11 +19,10 @@
#include "pam.h"
+#include <security/pam_appl.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-
-#include <security/pam_appl.h>
#include <sys/mman.h> // mlock/munlock
#include "_cgo_export.h" // for input callbacks