diff options
author | Renato Botelho <renato@netgate.com> | 2016-03-17 09:59:28 -0300 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2016-03-17 09:59:28 -0300 |
commit | 89ba6d490219156dc7e7779431d9de445220df9d (patch) | |
tree | 714514bba8b7b4581df0f7be45c61b01049b6b4f /lib | |
parent | 56930d706911fdcf5e574a23ce39a1757907ee67 (diff) | |
parent | 3ea5fe04508eac3ddd7ebff9a4049f219d3037a6 (diff) | |
download | FreeBSD-src-89ba6d490219156dc7e7779431d9de445220df9d.zip FreeBSD-src-89ba6d490219156dc7e7779431d9de445220df9d.tar.gz |
Merge remote-tracking branch 'origin/releng/10.3' into RELENG_2_3
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libpam/modules/pam_ssh/Makefile | 5 | ||||
-rw-r--r-- | lib/libpam/modules/pam_ssh/pam_ssh.c | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile index dc86e06..56f3781 100644 --- a/lib/libpam/modules/pam_ssh/Makefile +++ b/lib/libpam/modules/pam_ssh/Makefile @@ -7,10 +7,7 @@ LIB= pam_ssh MAN= pam_ssh.8 SRCS= pam_ssh.c -# 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/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 }; /* |