aboutsummaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fsck_msdosfs/dir.c2
-rw-r--r--sbin/ifconfig/carp.c9
2 files changed, 8 insertions, 3 deletions
diff --git a/sbin/fsck_msdosfs/dir.c b/sbin/fsck_msdosfs/dir.c
index 2d7e4bcdc38f..de3d950c9611 100644
--- a/sbin/fsck_msdosfs/dir.c
+++ b/sbin/fsck_msdosfs/dir.c
@@ -769,7 +769,7 @@ readDosDirSection(struct fat_descriptor *fat, struct dosDirEntry *dir)
if (vallfn || invlfn) {
mod |= removede(fat,
invlfn ? invlfn : vallfn, p,
- invlfn ? invcl : valcl, -1, 0,
+ invlfn ? invcl : valcl, cl, cl,
fullpath(dir), 2);
vallfn = NULL;
invlfn = NULL;
diff --git a/sbin/ifconfig/carp.c b/sbin/ifconfig/carp.c
index 7c7398f92d48..f9737a9cb97c 100644
--- a/sbin/ifconfig/carp.c
+++ b/sbin/ifconfig/carp.c
@@ -156,8 +156,13 @@ setcarp_callback(if_ctx *ctx, void *arg __unused)
if (carpr_vrrp_adv_inter != 0)
carpr.carpr_vrrp_adv_inter = carpr_vrrp_adv_inter;
- if (ifconfig_carp_set_info(lifh, ctx->ifname, &carpr))
- err(1, "SIOCSVH");
+ if (ifconfig_carp_set_info(lifh, ctx->ifname, &carpr)) {
+ if (ifconfig_err_errtype(lifh) == OTHER)
+ err(1, "%s: %s", __func__,
+ strerror(ifconfig_err_errno(lifh)));
+ else
+ err(1, "%s: %d", __func__, ifconfig_err_errtype(lifh));
+ }
}
static void