aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDag-Erling Smørgrav <des@FreeBSD.org>2016-03-11 11:38:31 +0000
committerDag-Erling Smørgrav <des@FreeBSD.org>2016-03-11 11:38:31 +0000
commite7c246c5f1485789ab6c1c0be93fbd6257b2a73f (patch)
treef157f0cbb4de751afbdfcea8fc9535ee0c4bde08 /lib
parent9bb18677baa4cd832215ea69f10fe89e1e381c38 (diff)
downloadsrc-e7c246c5f1485789ab6c1c0be93fbd6257b2a73f.tar.gz
src-e7c246c5f1485789ab6c1c0be93fbd6257b2a73f.zip
Define __bounded__ to fix the gcc build. While there, raise WARNS.
Notes
Notes: svn path=/head/; revision=296651
Diffstat (limited to 'lib')
-rw-r--r--lib/libpam/modules/pam_ssh/Makefile1
-rw-r--r--lib/libpam/modules/pam_ssh/pam_ssh.c5
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/libpam/modules/pam_ssh/Makefile b/lib/libpam/modules/pam_ssh/Makefile
index af44d6e51def..a2dabc58389f 100644
--- a/lib/libpam/modules/pam_ssh/Makefile
+++ b/lib/libpam/modules/pam_ssh/Makefile
@@ -7,7 +7,6 @@ LIB= pam_ssh
MAN= pam_ssh.8
SRCS= pam_ssh.c
-WARNS?= 3
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 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 };
/*