aboutsummaryrefslogtreecommitdiff
path: root/lib/libpam
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2016-03-14 18:54:29 +0000
committerGlen Barber <gjb@FreeBSD.org>2016-03-14 18:54:29 +0000
commit538354481ef7dbcd76ebc7334512a9d60994b84e (patch)
tree7aa3dd8f24b6558f2ef57be4db6203ac91424ea3 /lib/libpam
parent7d536dc855c85c15bf45f033d108a61b1f3cecc3 (diff)
parent9580c0f7ce319d3e4e213faa40b59bd91c7b66ba (diff)
downloadsrc-538354481ef7dbcd76ebc7334512a9d60994b84e.tar.gz
src-538354481ef7dbcd76ebc7334512a9d60994b84e.zip
MFH
Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/projects/release-pkg/; revision=296869
Diffstat (limited to 'lib/libpam')
-rw-r--r--lib/libpam/modules/pam_ssh/Makefile5
-rw-r--r--lib/libpam/modules/pam_ssh/Makefile.depend2
-rw-r--r--lib/libpam/modules/pam_ssh/pam_ssh.c5
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index 8965018e32b2..8de1bdfadc86 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -8,10 +8,7 @@ MAN= pam_ssh.8
SRCS= pam_ssh.c
PACKAGE= ssh
-# required when linking with a dynamic libssh
-SRCS+= roaming_dummy.c
-
-WARNS?= 3
+WARNS?= 5
CFLAGS+= -I${SSHDIR} -include ssh_namespace.h
SRCS+= ssh_namespace.h
diff --git a/lib/libpam/modules/pam_ssh/Makefile.depend b/lib/libpam/modules/pam_ssh/Makefile.depend
index 08fb149ea124..6b7118bcd2a0 100644
--- a/lib/libpam/modules/pam_ssh/Makefile.depend
+++ b/lib/libpam/modules/pam_ssh/Makefile.depend
@@ -5,13 +5,11 @@ DIRDEPS = \
gnu/lib/csu \
gnu/lib/libgcc \
include \
- include/arpa \
include/xlocale \
lib/${CSU_DIR} \
lib/libc \
lib/libcompiler_rt \
lib/libpam/libpam \
- lib/libutil \
secure/lib/libcrypto \
secure/lib/libssh \
diff --git a/lib/libpam/modules/pam_ssh/pam_ssh.c b/lib/libpam/modules/pam_ssh/pam_ssh.c
index 8fc68fd324f4..f95c73768baa 100644
--- a/lib/libpam/modules/pam_ssh/pam_ssh.c
+++ b/lib/libpam/modules/pam_ssh/pam_ssh.c
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
#include <openssl/evp.h>
+#define __bounded__(x, y, z)
#include "key.h"
#include "buffer.h"
#include "authfd.h"
@@ -84,7 +85,9 @@ static const char *pam_ssh_keyfiles[] = {
};
static const char *pam_ssh_agent = "/usr/bin/ssh-agent";
-static char *const pam_ssh_agent_argv[] = { "ssh_agent", "-s", NULL };
+static char str_ssh_agent[] = "ssh-agent";
+static char str_dash_s[] = "-s";
+static char *const pam_ssh_agent_argv[] = { str_ssh_agent, str_dash_s, NULL };
static char *const pam_ssh_agent_envp[] = { NULL };
/*