Module Name: src
Committed By: maxv
Date: Sat May 19 19:32:16 UTC 2018
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: cfparse.y isakmp_cfg.c
isakmp_frag.c isakmp_xauth.c
Log Message:
More unused variables.
To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/crypto/dist/ipsec-tools/src/racoon/cfparse.y
cvs rdiff -u -r1.26 -r1.27 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
cvs rdiff -u -r1.7 -r1.8 src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c
cvs rdiff -u -r1.28 -r1.29 \
src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/cfparse.y
diff -u src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.49 src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.50
--- src/crypto/dist/ipsec-tools/src/racoon/cfparse.y:1.49 Wed Feb 17 20:11:17 2016
+++ src/crypto/dist/ipsec-tools/src/racoon/cfparse.y Sat May 19 19:32:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cfparse.y,v 1.49 2016/02/17 20:11:17 christos Exp $ */
+/* $NetBSD: cfparse.y,v 1.50 2018/05/19 19:32:16 maxv Exp $ */
/* Id: cfparse.y,v 1.66 2006/08/22 18:17:17 manubsd Exp */
@@ -1543,7 +1543,6 @@ sainfo_id
{
char portbuf[10];
struct sockaddr *laddr = NULL, *haddr = NULL;
- char *cur = NULL;
if (($6 == IPPROTO_ICMP || $6 == IPPROTO_ICMPV6)
&& ($5 != IPSEC_PORT_ANY || $5 != IPSEC_PORT_ANY)) {
@@ -2013,7 +2012,6 @@ remote_spec
| PEERS_CERTFILE CERT_PLAINRSA QUOTEDSTRING
{
char path[MAXPATHLEN];
- int ret = 0;
if (cur_rmconf->peerscert != NULL) {
yyerror("peers_certfile already defined\n");
@@ -2365,7 +2363,6 @@ cert_spec
| CERT_PLAINRSA QUOTEDSTRING
{
char path[MAXPATHLEN];
- int ret = 0;
if (cur_rmconf->mycert != NULL) {
yyerror("certificate_type already defined\n");
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.26 src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.27
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c:1.26 Wed Mar 9 22:27:17 2016
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_cfg.c Sat May 19 19:32:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_cfg.c,v 1.26 2016/03/09 22:27:17 christos Exp $ */
+/* $NetBSD: isakmp_cfg.c,v 1.27 2018/05/19 19:32:16 maxv Exp $ */
/* Id: isakmp_cfg.c,v 1.55 2006/08/22 18:17:17 manubsd Exp */
@@ -322,7 +322,6 @@ isakmp_cfg_reply(iph1, attrpl)
size_t alen;
char *npp;
int type;
- struct sockaddr_in *sin;
int error;
tlen = ntohs(attrpl->h.len);
@@ -782,7 +781,6 @@ isakmp_cfg_net(iph1, attr)
{
int type;
int confsource;
- in_addr_t addr4;
type = ntohs(attr->type);
@@ -1665,7 +1663,6 @@ isakmp_cfg_accounting_system(port, raddr
char *usr;
int inout;
{
- int error = 0;
struct utmpx ut;
char addr[NI_MAXHOST];
@@ -1880,8 +1877,6 @@ isakmp_cfg_setenv(iph1, envp, envc)
char defdom[MAXPATHLEN + 1];
int cidr, tmp;
char cidrstr[4];
- int i, p;
- int test;
plog(LLV_DEBUG, LOCATION, NULL, "Starting a script.\n");
@@ -2134,7 +2129,6 @@ isakmp_cfg_init(cold)
int cold;
{
int i;
- int error;
isakmp_cfg_config.network4 = (in_addr_t)0x00000000;
isakmp_cfg_config.netmask4 = (in_addr_t)0x00000000;
@@ -2184,6 +2178,7 @@ isakmp_cfg_init(cold)
isakmp_cfg_config.splitdns_len = 0;
#if 0
+ int error;
if (cold == ISAKMP_CFG_INIT_COLD) {
if ((error = isakmp_cfg_resize_pool(ISAKMP_CFG_MAX_CNX)) != 0)
return error;
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c:1.7 src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c:1.8
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c:1.7 Sun Jul 23 05:40:27 2017
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_frag.c Sat May 19 19:32:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_frag.c,v 1.7 2017/07/23 05:40:27 christos Exp $ */
+/* $NetBSD: isakmp_frag.c,v 1.8 2018/05/19 19:32:16 maxv Exp $ */
/* Id: isakmp_frag.c,v 1.4 2004/11/13 17:31:36 manubsd Exp */
@@ -219,7 +219,6 @@ isakmp_frag_extract(iph1, msg)
struct isakmp_frag *frag;
struct isakmp_frag_item *item;
vchar_t *buf;
- size_t len;
int last_frag = 0;
char *data;
int i;
Index: src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.28 src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.29
--- src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c:1.28 Wed Mar 9 15:58:25 2016
+++ src/crypto/dist/ipsec-tools/src/racoon/isakmp_xauth.c Sat May 19 19:32:16 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isakmp_xauth.c,v 1.28 2016/03/09 15:58:25 christos Exp $ */
+/* $NetBSD: isakmp_xauth.c,v 1.29 2018/05/19 19:32:16 maxv Exp $ */
/* Id: isakmp_xauth.c,v 1.38 2006/08/22 18:17:17 manubsd Exp */
@@ -655,7 +655,6 @@ PAM_conv(msg_count, msg, rsp, dontcare)
void *dontcare;
{
int i;
- int replies = 0;
struct pam_response *reply = NULL;
if ((reply = racoon_malloc(sizeof(*reply) * msg_count)) == NULL)
@@ -712,10 +711,6 @@ xauth_login_pam(port, raddr, usr, pwd)
char *pwd;
{
int error;
- int res;
- const void *data;
- size_t len;
- int type;
char *remote = NULL;
pam_handle_t *pam = NULL;
@@ -1630,7 +1625,6 @@ isakmp_xauth_set(iph1, attr)
{
int type;
vchar_t *buffer = NULL;
- char *data;
struct xauth_state *xst;
size_t dlen = 0;
char* mraw = NULL, *mdata;
