diff options
author | gjb <gjb@FreeBSD.org> | 2016-03-14 18:54:29 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2016-03-14 18:54:29 +0000 |
commit | 086e6f562ffbb6de24f1e51c7df40f403dd1522b (patch) | |
tree | 7aa3dd8f24b6558f2ef57be4db6203ac91424ea3 /lib/libpam/modules | |
parent | 1c7e318a9a31cae130bd5b2de01d93e7800f66ff (diff) | |
parent | aab6aadc586e30f7b3512d20c6a5f780bddc2de3 (diff) | |
download | FreeBSD-src-086e6f562ffbb6de24f1e51c7df40f403dd1522b.zip FreeBSD-src-086e6f562ffbb6de24f1e51c7df40f403dd1522b.tar.gz |
MFH
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'lib/libpam/modules')
-rw-r--r-- | lib/libpam/modules/pam_ssh/Makefile | 5 | ||||
-rw-r--r-- | lib/libpam/modules/pam_ssh/Makefile.depend | 2 | ||||
-rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.c | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index 8965018..8de1bdf 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 08fb149..6b7118b 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 8fc68fd..f95c737 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 }; /* |