svn commit: r296651 - head/lib/libpam/modules/pam_ssh

[Dag-Erling Smørgrav]

Author: des
Date: Fri Mar 11 11:38:31 2016
New Revision: 296651
URL: https://svnweb.freebsd.org/changeset/base/296651

Log:
  Define __bounded__ to fix the gcc build.  While there, raise WARNS.

Modified:
  head/lib/libpam/modules/pam_ssh/Makefile
  head/lib/libpam/modules/pam_ssh/pam_ssh.c

Modified: head/lib/libpam/modules/pam_ssh/Makefile
==============================================================================
--- head/lib/libpam/modules/pam_ssh/Makefile	Fri Mar 11 09:55:24 2016	(r296650)
+++ head/lib/libpam/modules/pam_ssh/Makefile	Fri Mar 11 11:38:31 2016	(r296651)
@@ -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
 

Modified: head/lib/libpam/modules/pam_ssh/pam_ssh.c
==============================================================================
--- head/lib/libpam/modules/pam_ssh/pam_ssh.c	Fri Mar 11 09:55:24 2016	(r296650)
+++ head/lib/libpam/modules/pam_ssh/pam_ssh.c	Fri Mar 11 11:38:31 2016	(r296651)
@@ -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 };
 
 /*