summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/net/if_vlan.c4
-rw-r--r--sys/ufs/ext2fs/ext2fs_lookup.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c
index 7b87936dcd5..a33baba64fb 100644
--- a/sys/net/if_vlan.c
+++ b/sys/net/if_vlan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vlan.c,v 1.42 2003/12/03 14:55:58 markus Exp $ */
+/* $OpenBSD: if_vlan.c,v 1.43 2003/12/06 09:23:25 grange Exp $ */
/*
* Copyright 1998 Massachusetts Institute of Technology
*
@@ -665,8 +665,10 @@ vlan_ether_addmulti(struct ifvlan *ifv, struct ifreq *ifr)
u_int8_t addrlo[ETHER_ADDR_LEN], addrhi[ETHER_ADDR_LEN];
int error;
+ /* XXX: sa_len is too small for such comparison
if (ifr->ifr_addr.sa_len > sizeof(struct sockaddr_storage))
return (EINVAL);
+ */
error = ether_addmulti(ifr, (struct arpcom *)&ifv->ifv_ac);
if (error != ENETRESET)
diff --git a/sys/ufs/ext2fs/ext2fs_lookup.c b/sys/ufs/ext2fs/ext2fs_lookup.c
index d46a143af96..1b08a6c813a 100644
--- a/sys/ufs/ext2fs/ext2fs_lookup.c
+++ b/sys/ufs/ext2fs/ext2fs_lookup.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_lookup.c,v 1.16 2003/06/02 23:28:22 millert Exp $ */
+/* $OpenBSD: ext2fs_lookup.c,v 1.17 2003/12/06 09:23:25 grange Exp $ */
/* $NetBSD: ext2fs_lookup.c,v 1.16 2000/08/03 20:29:26 thorpej Exp $ */
/*
@@ -101,8 +101,10 @@ ext2fs_dirconv2ffs( e2dir, ffsdir)
* XXX Rigth now this can't happen, but if one day
* MAXNAMLEN != E2FS_MAXNAMLEN we should handle this more gracefully !
*/
+ /* XXX: e2d_namlen is to small for such comparison
if (e2dir->e2d_namlen > MAXNAMLEN)
panic("ext2fs: e2dir->e2d_namlen");
+ */
#endif
strncpy(ffsdir->d_name, e2dir->e2d_name, ffsdir->d_namlen);