Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sunos compatible /var/yp/binding/ files.

Browse Source 
fix const warning
This commit is contained in:
deraadt 1993-12-03 10:10:21 +00:00
parent 2b728f4750
commit 66cf56ad97
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/libc/yp/yplib.c
View File

@ -28,13 +28,14 @@
*/ */
#ifndef LINT #ifndef LINT
static char *rcsid = "$Id: yplib.c,v 1.6 1993/08/26 00:48:21 jtc Exp $"; static char *rcsid = "$Id: yplib.c,v 1.7 1993/12/03 10:10:21 deraadt Exp $";
#endif #endif
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/file.h> #include <sys/file.h>
#include <sys/uio.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -221,12 +222,30 @@ again:
return YPERR_YPBIND; return YPERR_YPBIND;
} }
if( flock(fd, LOCK_EX|LOCK_NB) == -1 && errno==EWOULDBLOCK) { if( flock(fd, LOCK_EX|LOCK_NB) == -1 && errno==EWOULDBLOCK) {
r = read(fd, &ysd->dom_server_addr, sizeof ysd->dom_server_addr); struct iovec iov[2];
if(r != sizeof ysd->dom_server_addr) { struct ypbind_resp ybr;
u_short ypb_port;
iov[0].iov_base = (caddr_t)&ypb_port;
iov[0].iov_len = sizeof ypb_port;
iov[1].iov_base = (caddr_t)&ybr;
iov[1].iov_len = sizeof ybr;
r = readv(fd, iov, 2);
if(r != iov[0].iov_len + iov[1].iov_len) {
close(fd); close(fd);
ysd->dom_vers = -1; ysd->dom_vers = -1;
goto again; goto again;
} }
bzero(&ysd->dom_server_addr, sizeof ysd->dom_server_addr);
ysd->dom_server_addr.sin_family = AF_INET;
ysd->dom_server_addr.sin_len = sizeof(struct sockaddr_in);
ysd->dom_server_addr.sin_addr =
ybr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_addr;
ysd->dom_server_addr.sin_port =
ybr.ypbind_respbody.ypbind_bindinfo.ypbind_binding_port;
ysd->dom_server_port = ysd->dom_server_addr.sin_port; ysd->dom_server_port = ysd->dom_server_addr.sin_port;
close(fd); close(fd);
goto gotit; goto gotit;
@ -381,7 +400,7 @@ again:
yprk.domain = indomain; yprk.domain = indomain;
yprk.map = inmap; yprk.map = inmap;
yprk.keydat.dptr = inkey; yprk.keydat.dptr = (char *)inkey;
yprk.keydat.dsize = inkeylen; yprk.keydat.dsize = inkeylen;
bzero((char *)&yprv, sizeof yprv); bzero((char *)&yprv, sizeof yprv);