diff options
author | dim <dim@FreeBSD.org> | 2011-12-16 22:05:10 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2011-12-16 22:05:10 +0000 |
commit | f993aa3b863809756f87bebcf680317da2ba883a (patch) | |
tree | 68350e27a01812778e1eb9f628ab781826b880c7 /libexec/ypxfr/ypxfr_main.c | |
parent | ca3809987c8b011d422ebb5ab09c96ca7fbbbf8a (diff) | |
download | FreeBSD-src-f993aa3b863809756f87bebcf680317da2ba883a.zip FreeBSD-src-f993aa3b863809756f87bebcf680317da2ba883a.tar.gz |
Fix the incompatible enum conversions in libexec/ypxfr in another, more
messy way, so as to not disrupt other yp programs: just add casts to
convert the incompatible enums, as the numerical values are the same
(either by accident, design, or the phase of the moon at that time).
MFC after: 1 week
Diffstat (limited to 'libexec/ypxfr/ypxfr_main.c')
-rw-r--r-- | libexec/ypxfr/ypxfr_main.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libexec/ypxfr/ypxfr_main.c b/libexec/ypxfr/ypxfr_main.c index f6b478a..70fd1f5 100644 --- a/libexec/ypxfr/ypxfr_main.c +++ b/libexec/ypxfr/ypxfr_main.c @@ -88,7 +88,7 @@ ypxfr_exit(ypxfrstat retval, char *temp) exit(1); } - ypxfr_resp.status = retval; + ypxfr_resp.status = (yppush_status)retval; if (yppushproc_xfrresp_1(&ypxfr_resp, clnt) == NULL) { yp_error("%s", clnt_sperror(clnt, "callback failed")); @@ -329,7 +329,7 @@ the local domain name isn't set"); ypxfr_use_yplib)) == NULL) { yp_error("failed to find master of %s in domain %s: %s", ypxfr_mapname, ypxfr_source_domain, - ypxfrerr_string(yp_errno)); + ypxfrerr_string((ypxfrstat)yp_errno)); ypxfr_exit(YPXFR_MADDR,NULL); } } @@ -358,7 +358,8 @@ the local domain name isn't set"); ypxfr_master, 0)) == 0) { yp_error("failed to get order number of %s: %s", ypxfr_mapname, yp_errno == YPXFR_SUCC ? - "map has order 0" : ypxfrerr_string(yp_errno)); + "map has order 0" : + ypxfrerr_string((ypxfrstat)yp_errno)); ypxfr_exit(YPXFR_YPERR,NULL); } @@ -533,7 +534,8 @@ leave: ypxfr_master, 0)) == 0) { yp_error("failed to get order number of %s: %s", ypxfr_mapname, yp_errno == YPXFR_SUCC ? - "map has order 0" : ypxfrerr_string(yp_errno)); + "map has order 0" : + ypxfrerr_string((ypxfrstat)yp_errno)); ypxfr_exit(YPXFR_YPERR,ypxfr_temp_map); } |