d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use err(3). Cosmetic in usage(). Delay the compute of defaultdomain (from

Browse Source 
OpenBSD).
Obtained from: OpenBSD.
This commit is contained in:
Philippe Charnier 1997-08-29 11:56:51 +00:00
parent 3eff8361b9
commit 7008c93ddf
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=28895
1 changed files with 28 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
usr.bin/ypwhich/ypwhich.c
View File

@ -27,16 +27,21 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#ifndef LINT #ifndef lint
static char rcsid[] = "ypwhich.c,v 1.2 1993/05/16 02:49:10 deraadt Exp"; static const char rcsid[] =
#endif "$Id$";
#endif /* not lint */
#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 <stdio.h>
#include <ctype.h> #include <ctype.h>
#include <err.h>
#include <netdb.h> #include <netdb.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <rpc/rpc.h> #include <rpc/rpc.h>
#include <rpc/xdr.h> #include <rpc/xdr.h>
#include <rpcsvc/yp.h> #include <rpcsvc/yp.h>
@ -65,11 +70,12 @@ struct ypalias {
{ "ethers", "ethers.byname" }, { "ethers", "ethers.byname" },
}; };
static void
usage() usage()
{ {
fprintf(stderr, "Usage:\n"); fprintf(stderr, "%s\n%s\n",
fprintf(stderr, "\typwhich [-d domain] [[-t] -m [mname] | host]\n"); "usage: ypwhich [-d domain] [[-t] -m [mname] | host]",
fprintf(stderr, "\typwhich -x\n"); " ypwhich -x");
exit(ERR_USAGE); exit(ERR_USAGE);
} }
@ -77,13 +83,13 @@ usage()
/* /*
* Like yp_bind except can query a specific host * Like yp_bind except can query a specific host
*/ */
int
bind_host(dom, sin) bind_host(dom, sin)
char *dom; char *dom;
struct sockaddr_in *sin; struct sockaddr_in *sin;
{ {
struct hostent *hent = NULL; struct hostent *hent = NULL;
struct ypbind_resp ypbr; struct ypbind_resp ypbr;
struct dom_binding *ysd;
struct timeval tv; struct timeval tv;
CLIENT *client; CLIENT *client;
int sock, r; int sock, r;
@ -94,8 +100,7 @@ struct sockaddr_in *sin;
tv.tv_usec = 0; tv.tv_usec = 0;
client = clntudp_create(sin, YPBINDPROG, YPBINDVERS, tv, &sock); client = clntudp_create(sin, YPBINDPROG, YPBINDVERS, tv, &sock);
if(client==NULL) { if(client==NULL) {
fprintf(stderr, "can't clntudp_create: %s\n", warnx("can't clntudp_create: %s", yperr_string(YPERR_YPBIND));
yperr_string(YPERR_YPBIND));
return YPERR_YPBIND; return YPERR_YPBIND;
} }
@ -104,13 +109,12 @@ struct sockaddr_in *sin;
r = clnt_call(client, YPBINDPROC_DOMAIN, r = clnt_call(client, YPBINDPROC_DOMAIN,
xdr_domainname, &dom, xdr_ypbind_resp, &ypbr, tv); xdr_domainname, &dom, xdr_ypbind_resp, &ypbr, tv);
if( r != RPC_SUCCESS) { if( r != RPC_SUCCESS) {
fprintf(stderr, "can't clnt_call: %s\n", warnx("can't clnt_call: %s", yperr_string(YPERR_YPBIND));
yperr_string(YPERR_YPBIND));
clnt_destroy(client); clnt_destroy(client);
return YPERR_YPBIND; return YPERR_YPBIND;
} else { } else {
if (ypbr.ypbind_status != YPBIND_SUCC_VAL) { if (ypbr.ypbind_status != YPBIND_SUCC_VAL) {
fprintf(stderr, "can't yp_bind: Reason: %s\n", warnx("can't yp_bind: reason: %s",
ypbinderr_string(ypbr.ypbind_resp_u.ypbind_error)); ypbinderr_string(ypbr.ypbind_resp_u.ypbind_error));
clnt_destroy(client); clnt_destroy(client);
return r; return r;
@ -132,18 +136,13 @@ int
main(argc, argv) main(argc, argv)
char **argv; char **argv;
{ {
char *domainname, *master, *map; char *domainname = NULL, *master, *map = NULL;
struct ypmaplist *ypml, *y; struct ypmaplist *ypml, *y;
extern char *optarg;
extern int optind;
struct hostent *hent; struct hostent *hent;
struct sockaddr_in sin; struct sockaddr_in sin;
int notrans, mode, getmap; int notrans, mode, getmap;
int c, r, i; int c, r, i;
yp_get_default_domain(&domainname);
map = NULL;
getmap = notrans = mode = 0; getmap = notrans = mode = 0;
while( (c=getopt(argc, argv, "xd:mt")) != -1) while( (c=getopt(argc, argv, "xd:mt")) != -1)
switch(c) { switch(c) {
@ -166,6 +165,9 @@ char **argv;
usage(); usage();
} }
if(!domainname)
yp_get_default_domain(&domainname);
if(mode==0) { if(mode==0) {
switch(argc-optind) { switch(argc-optind) {
case 0: case 0:
@ -181,11 +183,8 @@ char **argv;
sin.sin_family = AF_INET; sin.sin_family = AF_INET;
if( (sin.sin_addr.s_addr=inet_addr(argv[optind]))==-1) { if( (sin.sin_addr.s_addr=inet_addr(argv[optind]))==-1) {
hent = gethostbyname(argv[optind]); hent = gethostbyname(argv[optind]);
if(!hent) { if(!hent)
fprintf(stderr, "ypwhich: host %s unknown\n", errx(ERR_NOSUCHHOST, "host %s unknown", argv[optind]);
argv[optind]);
exit(ERR_NOSUCHHOST);
}
bcopy((char *)hent->h_addr_list[0], bcopy((char *)hent->h_addr_list[0],
(char *)&sin.sin_addr, sizeof sin.sin_addr); (char *)&sin.sin_addr, sizeof sin.sin_addr);
} }
@ -213,12 +212,10 @@ char **argv;
free(master); free(master);
break; break;
case YPERR_YPBIND: case YPERR_YPBIND:
fprintf(stderr, "ypwhich: not running ypbind\n"); errx(ERR_NOYPBIND, "not running ypbind");
exit(ERR_NOYPBIND);
default: default:
fprintf(stderr, "Can't find master for map %s. Reason: %s\n", errx(ERR_NOMASTER, "can't find master for map %s. reason: %s",
map, yperr_string(r)); map, yperr_string(r));
exit(ERR_NOMASTER);
} }
exit(0); exit(0);
} }
@ -236,8 +233,7 @@ char **argv;
free(master); free(master);
break; break;
default: default:
fprintf(stderr, warnx("can't find the master of %s: reason: %s",
"YP: can't find the master of %s: Reason: %s\n",
ypml->map, yperr_string(r)); ypml->map, yperr_string(r));
break; break;
} }
@ -246,12 +242,10 @@ char **argv;
} }
break; break;
case YPERR_YPBIND: case YPERR_YPBIND:
fprintf(stderr, "ypwhich: not running ypbind\n"); errx(ERR_NOYPBIND, "not running ypbind");
exit(ERR_NOYPBIND);
default: default:
fprintf(stderr, "Can't get map list for domain %s. Reason: %s\n", errx(ERR_NOMASTER, "can't get map list for domain %s. reason: %s",
domainname, yperr_string(r)); domainname, yperr_string(r));
exit(ERR_NOMASTER);
} }
exit(0); exit(0);
} }