From 744dbff34969ef612b219cde5b8f116f3ae3d26f Mon Sep 17 00:00:00 2001 From: "Joe Richey joerichey@google.com" Date: Mon, 17 Jul 2017 23:16:00 -0700 Subject: Small fixes so "make lint" doesn't complain. --- pam/pam.c | 3 ++- pam/pam.go | 6 +++++- pam/pam.h | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'pam') diff --git a/pam/pam.c b/pam/pam.c index aee6671..4769705 100644 --- a/pam/pam.c +++ b/pam/pam.c @@ -79,7 +79,8 @@ static int conversation(int num_msg, const struct pam_message** msg, return PAM_SUCCESS; } -const struct pam_conv conv = {conversation, NULL}; +static const struct pam_conv conv = {conversation, NULL}; +const struct pam_conv* goConv = &conv; void freeData(pam_handle_t* pamh, void* data, int error_status) { free(data); } diff --git a/pam/pam.go b/pam/pam.go index 43bfd2e..e928883 100644 --- a/pam/pam.go +++ b/pam/pam.go @@ -179,7 +179,11 @@ func Start(service, username string) (*Transaction, error) { handle: nil, status: C.PAM_SUCCESS, } - t.status = C.pam_start(cService, cUsername, &C.conv, &t.handle) + t.status = C.pam_start( + cService, + cUsername, + C.goConv, + &t.handle) return t, (*Handle)(t).err() } diff --git a/pam/pam.h b/pam/pam.h index 9f3cdb2..09afb2e 100644 --- a/pam/pam.h +++ b/pam/pam.h @@ -23,7 +23,7 @@ #include // Conversation that will call back into Go code when appropriate. -const struct pam_conv conv; +const struct pam_conv *goConv; // CleaupFuncs are used to cleanup specific PAM data. typedef void (*CleanupFunc)(pam_handle_t *pamh, void *data, int error_status); -- cgit v1.2.3