diff options
| author | Hakan Olsson <ho@cvs.openbsd.org> | 2002-07-05 11:08:14 +0000 |
|---|---|---|
| committer | Hakan Olsson <ho@cvs.openbsd.org> | 2002-07-05 11:08:14 +0000 |
| commit | a50497e8bba9d550699131cb96ffa238af6eb99c (patch) | |
| tree | 8474c8bfe3df31807e8a272a314999192fc049fa /sbin | |
| parent | 4296acf306de19233d83a0a747fb3d5a6e754ae0 (diff) | |
gcc 3.1 nits. Pointed out by David Krause.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/ipsec.c | 6 | ||||
| -rw-r--r-- | sbin/isakmpd/math_2n.c | 5 | ||||
| -rw-r--r-- | sbin/isakmpd/pf_key_v2.c | 11 |
3 files changed, 12 insertions, 10 deletions
diff --git a/sbin/isakmpd/ipsec.c b/sbin/isakmpd/ipsec.c index 8a3bc0d13bd..91272472ce9 100644 --- a/sbin/isakmpd/ipsec.c +++ b/sbin/isakmpd/ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsec.c,v 1.68 2002/06/14 12:43:11 ho Exp $ */ +/* $OpenBSD: ipsec.c,v 1.69 2002/07/05 11:08:13 ho Exp $ */ /* $EOM: ipsec.c,v 1.143 2000/12/11 23:57:42 niklas Exp $ */ /* @@ -377,8 +377,8 @@ ipsec_finalize_exchange (struct message *msg) LOG_DBG ((LOG_EXCHANGE, 50, "ipsec_finalize_exchange: " "src %s %s dst %s %s tproto %u sport %u dport %u", - addr1 ? addr1 : "<???>" , mask1 ? mask1 : "<???>", - addr2 ? addr2 : "<???>" , mask2 ? mask2 : "<???>", + addr1 ? addr1 : "<??\?>" , mask1 ? mask1 : "<??\?>", + addr2 ? addr2 : "<??\?>" , mask2 ? mask2 : "<??\?>", isa->tproto, ntohs (isa->sport), ntohs (isa->dport))); if (addr1) diff --git a/sbin/isakmpd/math_2n.c b/sbin/isakmpd/math_2n.c index 3060df266bf..f4bbff4b970 100644 --- a/sbin/isakmpd/math_2n.c +++ b/sbin/isakmpd/math_2n.c @@ -1,4 +1,4 @@ -/* $OpenBSD: math_2n.c,v 1.10 2002/06/09 08:13:06 todd Exp $ */ +/* $OpenBSD: math_2n.c,v 1.11 2002/07/05 11:08:13 ho Exp $ */ /* $EOM: math_2n.c,v 1.15 1999/04/20 09:23:30 niklas Exp $ */ /* @@ -455,7 +455,8 @@ b2n_lshift (b2n_ptr d, b2n_ptr n, unsigned int s) for (i = d->chunks - 2; i >= maj; i--) { op--; - *p-- = (*p << min) | (*op >> (CHUNK_BITS - min)); + *p = (*p << min) | (*op >> (CHUNK_BITS - min)); + p--; } *p <<= min; diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c index 47f70c25e00..4f29517811a 100644 --- a/sbin/isakmpd/pf_key_v2.c +++ b/sbin/isakmpd/pf_key_v2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf_key_v2.c,v 1.111 2002/06/11 18:50:21 ho Exp $ */ +/* $OpenBSD: pf_key_v2.c,v 1.112 2002/07/05 11:08:13 ho Exp $ */ /* $EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $ */ /* @@ -1899,8 +1899,8 @@ pf_key_v2_flow (struct sockaddr *laddr, struct sockaddr *lmask, LOG_DBG ((LOG_SYSDEP, 50, "pf_key_v2_flow: src %s %s dst %s %s proto %u sport %u dport %u", - laddr_str ? laddr_str : "<???>", lmask_str ? lmask_str : "<???>", - raddr_str ? raddr_str : "<???>", rmask_str ? rmask_str : "<???>", + laddr_str ? laddr_str : "<??\?>", lmask_str ? lmask_str : "<??\?>", + raddr_str ? raddr_str : "<??\?>", rmask_str ? rmask_str : "<??\?>", tproto, ntohs (sport), ntohs (dport))); if (laddr_str) @@ -2101,8 +2101,9 @@ pf_key_v2_flow (struct sockaddr *laddr, struct sockaddr *lmask, rmask_str = 0; LOG_DBG ((LOG_SYSDEP, 50, "pf_key_v2_flow: src %x %x dst %x %x", - laddr_str ? laddr_str : "<???>", lmask_str ? laddr_str : "<???>", - raddr_str ? laddr_str : "<???>", rmask_str ? laddr_str : "<???>")); + laddr_str ? laddr_str : "<??\?>", lmask_str ? laddr_str : "<??\?>", + raddr_str ? laddr_str : "<??\?>", + rmask_str ? laddr_str : "<??\?>")); if (laddr_str) free (laddr_str); |