diff --git a/usr.sbin/bootparamd/bootparamd/bootparamd.c b/usr.sbin/bootparamd/bootparamd/bootparamd.c index 205b6c74c280..c6387304cd61 100644 --- a/usr.sbin/bootparamd/bootparamd/bootparamd.c +++ b/usr.sbin/bootparamd/bootparamd/bootparamd.c @@ -1,358 +1,358 @@ /* This code is not copyright, and is placed in the public domain. Feel free to use and modify. Please send modifications and/or suggestions + bug fixes to Klas Heggemann */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ #ifdef YP #include #include #include #endif #include "bootparam_prot.h" #include #include #include #include #include #include #include #include #include extern int debug, dolog; -extern unsigned long route_addr; +extern in_addr_t route_addr; extern char *bootpfile; #define MAXLEN 800 struct hostent *he; static char buffer[MAXLEN]; static char hostname[MAX_MACHINE_NAME]; static char askname[MAX_MACHINE_NAME]; static char path[MAX_PATH_LEN]; static char domain_name[MAX_MACHINE_NAME]; int getthefile(char *, char *, char *, int); int checkhost(char *, char *, int); bp_whoami_res * bootparamproc_whoami_1_svc(whoami, req) bp_whoami_arg *whoami; struct svc_req *req; { - long haddr; + in_addr_t haddr; static bp_whoami_res res; if (debug) fprintf(stderr,"whoami got question for %d.%d.%d.%d\n", 255 & whoami->client_address.bp_address_u.ip_addr.net, 255 & whoami->client_address.bp_address_u.ip_addr.host, 255 & whoami->client_address.bp_address_u.ip_addr.lh, 255 & whoami->client_address.bp_address_u.ip_addr.impno); if (dolog) syslog(LOG_NOTICE, "whoami got question for %d.%d.%d.%d\n", 255 & whoami->client_address.bp_address_u.ip_addr.net, 255 & whoami->client_address.bp_address_u.ip_addr.host, 255 & whoami->client_address.bp_address_u.ip_addr.lh, 255 & whoami->client_address.bp_address_u.ip_addr.impno); bcopy((char *)&whoami->client_address.bp_address_u.ip_addr, (char *)&haddr, sizeof(haddr)); he = gethostbyaddr((char *)&haddr,sizeof(haddr),AF_INET); if ( ! he ) goto failed; if (debug) warnx("this is host %s", he->h_name); if (dolog) syslog(LOG_NOTICE,"This is host %s\n", he->h_name); strncpy(askname, he->h_name, sizeof(askname)); askname[sizeof(askname)-1] = 0; if (checkhost(askname, hostname, sizeof hostname) ) { res.client_name = hostname; getdomainname(domain_name, MAX_MACHINE_NAME); res.domain_name = domain_name; if ( res.router_address.address_type != IP_ADDR_TYPE ) { res.router_address.address_type = IP_ADDR_TYPE; - bcopy( &route_addr, &res.router_address.bp_address_u.ip_addr, 4); + bcopy( &route_addr, &res.router_address.bp_address_u.ip_addr, sizeof(in_addr_t)); } if (debug) fprintf(stderr, "Returning %s %s %d.%d.%d.%d\n", res.client_name, res.domain_name, 255 & res.router_address.bp_address_u.ip_addr.net, 255 & res.router_address.bp_address_u.ip_addr.host, 255 & res.router_address.bp_address_u.ip_addr.lh, 255 & res.router_address.bp_address_u.ip_addr.impno); if (dolog) syslog(LOG_NOTICE, "Returning %s %s %d.%d.%d.%d\n", res.client_name, res.domain_name, 255 & res.router_address.bp_address_u.ip_addr.net, 255 & res.router_address.bp_address_u.ip_addr.host, 255 & res.router_address.bp_address_u.ip_addr.lh, 255 & res.router_address.bp_address_u.ip_addr.impno); return(&res); } failed: if (debug) warnx("whoami failed"); if (dolog) syslog(LOG_NOTICE,"whoami failed\n"); return(NULL); } bp_getfile_res * bootparamproc_getfile_1_svc(getfile, req) bp_getfile_arg *getfile; struct svc_req *req; { char *where, *index(); static bp_getfile_res res; if (debug) warnx("getfile got question for \"%s\" and file \"%s\"", getfile->client_name, getfile->file_id); if (dolog) syslog(LOG_NOTICE,"getfile got question for \"%s\" and file \"%s\"\n", getfile->client_name, getfile->file_id); he = NULL; he = gethostbyname(getfile->client_name); if (! he ) goto failed; strncpy(askname, he->h_name, sizeof(askname)); askname[sizeof(askname)-1] = 0; if (getthefile(askname, getfile->file_id,buffer,sizeof(buffer))) { if ( (where = index(buffer,':')) ) { /* buffer is re-written to contain the name of the info of file */ strncpy(hostname, buffer, where - buffer); hostname[where - buffer] = '\0'; where++; strcpy(path, where); he = gethostbyname(hostname); if ( !he ) goto failed; bcopy( he->h_addr, &res.server_address.bp_address_u.ip_addr, 4); res.server_name = hostname; res.server_path = path; res.server_address.address_type = IP_ADDR_TYPE; } else { /* special for dump, answer with null strings */ if (!strcmp(getfile->file_id, "dump")) { res.server_name = ""; res.server_path = ""; res.server_address.address_type = IP_ADDR_TYPE; bzero(&res.server_address.bp_address_u.ip_addr,4); } else goto failed; } if (debug) fprintf(stderr, "returning server:%s path:%s address: %d.%d.%d.%d\n", res.server_name, res.server_path, 255 & res.server_address.bp_address_u.ip_addr.net, 255 & res.server_address.bp_address_u.ip_addr.host, 255 & res.server_address.bp_address_u.ip_addr.lh, 255 & res.server_address.bp_address_u.ip_addr.impno); if (dolog) syslog(LOG_NOTICE, "returning server:%s path:%s address: %d.%d.%d.%d\n", res.server_name, res.server_path, 255 & res.server_address.bp_address_u.ip_addr.net, 255 & res.server_address.bp_address_u.ip_addr.host, 255 & res.server_address.bp_address_u.ip_addr.lh, 255 & res.server_address.bp_address_u.ip_addr.impno); return(&res); } failed: if (debug) warnx("getfile failed for %s", getfile->client_name); if (dolog) syslog(LOG_NOTICE, "getfile failed for %s\n", getfile->client_name); return(NULL); } /* getthefile return 1 and fills the buffer with the information of the file, e g "host:/export/root/client" if it can be found. If the host is in the database, but the file is not, the buffer will be empty. (This makes it possible to give the special empty answer for the file "dump") */ int getthefile(askname,fileid,buffer,blen) char *askname; char *fileid, *buffer; int blen; { FILE *bpf; char *where; static char *result; int resultlen; #ifdef YP static char *yp_domain; #endif int ch, pch, fid_len, res = 0; int match = 0; char info[MAX_FILEID + MAX_PATH_LEN+MAX_MACHINE_NAME + 3]; bpf = fopen(bootpfile, "r"); if ( ! bpf ) errx(1, "no %s", bootpfile); /* XXX see comment below */ while ( fscanf(bpf, "%255s", hostname) > 0 && !match ) { if ( *hostname != '#' ) { /* comment */ if ( ! strcmp(hostname, askname) ) { match = 1; } else { he = gethostbyname(hostname); if (he && !strcmp(he->h_name, askname)) match = 1; } } if (*hostname == '+' ) { /* NIS */ #ifdef YP if (yp_get_default_domain(&yp_domain)) { if (debug) warn("NIS"); return(0); } if (yp_match(yp_domain, "bootparams", askname, strlen(askname), &result, &resultlen)) return (0); if (strstr(result, fileid) == NULL) { buffer[0] = '\0'; } else { snprintf(buffer, blen, "%s",strchr(strstr(result,fileid), '=') + 1); if (strchr(buffer, ' ') != NULL) *(char *)(strchr(buffer, ' ')) = '\0'; } if (fclose(bpf)) warnx("could not close %s", bootpfile); return(1); #else return(0); /* ENOTSUP */ #endif } /* skip to next entry */ if ( match ) break; pch = ch = getc(bpf); while ( ! ( ch == '\n' && pch != '\\') && ch != EOF) { pch = ch; ch = getc(bpf); } } /* if match is true we read the rest of the line to get the info of the file */ if (match) { fid_len = strlen(fileid); while ( ! res && (fscanf(bpf,"%s", info)) > 0) { /* read a string */ ch = getc(bpf); /* and a character */ if ( *info != '#' ) { /* Comment ? */ if (! strncmp(info, fileid, fid_len) && *(info + fid_len) == '=') { where = info + fid_len + 1; if ( isprint( *where )) { strcpy(buffer, where); /* found file */ res = 1; break; } } else { while (isspace(ch) && ch != '\n') ch = getc(bpf); /* read to end of line */ if ( ch == '\n' ) { /* didn't find it */ res = -1; break; /* but host is there */ } if ( ch == '\\' ) { /* more info */ ch = getc(bpf); /* maybe on next line */ if (ch == '\n') continue; /* read it in next loop */ ungetc(ch, bpf); ungetc('\\',bpf); /* push the character(s) back */ } else ungetc(ch, bpf); /* but who know what a `\` is */ } /* needed for. */ } else break; /* a commented rest-of-line */ } } if (fclose(bpf)) { warnx("could not close %s", bootpfile); } if ( res == -1) buffer[0] = '\0'; /* host found, file not */ return(match); } /* checkhost puts the hostname found in the database file in the hostname-variable and returns 1, if askname is a valid name for a host in the database */ int checkhost(askname, hostname, len) char *askname; char *hostname; int len; { int ch, pch; FILE *bpf; int res = 0; static char *result; int resultlen; #ifdef YP static char *yp_domain; #endif /* struct hostent *cmp_he;*/ bpf = fopen(bootpfile, "r"); if ( ! bpf ) errx(1, "no %s", bootpfile); /* XXX there is no way in ISO C to specify the maximal length for a conversion in a variable way */ while ( fscanf(bpf, "%254s", hostname) > 0 ) { if ( *hostname != '#' ) { /* comment */ if ( ! strcmp(hostname, askname) ) { /* return true for match of hostname */ res = 1; break; } else { /* check the alias list */ he = NULL; he = gethostbyname(hostname); if (he && !strcmp(askname, he->h_name)) { res = 1; break; } } } if (*hostname == '+' ) { /* NIS */ #ifdef YP if (yp_get_default_domain(&yp_domain)) { if (debug) warn("NIS"); return(0); } if (!yp_match(yp_domain, "bootparams", askname, strlen(askname), &result, &resultlen)) { /* return true for match of hostname */ he = NULL; he = gethostbyname(askname); if (he && !strcmp(askname, he->h_name)) { res = 1; snprintf(hostname, len, "%s", he->h_name); } } if (fclose(bpf)) warnx("could not close %s", bootpfile); return(res); #else return(0); /* ENOTSUP */ #endif } /* skip to next entry */ pch = ch = getc(bpf); while ( ! ( ch == '\n' && pch != '\\') && ch != EOF) { pch = ch; ch = getc(bpf); } } if (fclose(bpf)) { warnx("could not close %s", bootpfile); } return(res); } diff --git a/usr.sbin/bootparamd/bootparamd/main.c b/usr.sbin/bootparamd/bootparamd/main.c index edd78edd203b..87b8f96085af 100644 --- a/usr.sbin/bootparamd/bootparamd/main.c +++ b/usr.sbin/bootparamd/bootparamd/main.c @@ -1,118 +1,118 @@ /* This code is not copyright, and is placed in the public domain. Feel free to use and modify. Please send modifications and/or suggestions + bug fixes to Klas Heggemann */ #ifndef lint static const char rcsid[] = "$FreeBSD$"; #endif /* not lint */ #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include #include "bootparam_prot.h" int debug = 0; int dolog = 0; -unsigned long route_addr = -1; +in_addr_t route_addr = -1; struct sockaddr_in my_addr; char *bootpfile = "/etc/bootparams"; extern void bootparamprog_1(); static void usage(void); int main(argc, argv) int argc; char **argv; { SVCXPRT *transp; struct hostent *he; struct stat buf; char c; while ((c = getopt(argc, argv,"dsr:f:")) != -1) switch (c) { case 'd': debug = 1; break; case 'r': if (isdigit((unsigned char)*optarg)) { route_addr = inet_addr(optarg); break; } else { he = gethostbyname(optarg); if (he) { bcopy(he->h_addr, (char *)&route_addr, sizeof(route_addr)); break; } else { errx(1, "no such host %s", optarg); } } case 'f': bootpfile = optarg; break; case 's': dolog = 1; #ifndef LOG_DAEMON openlog("bootparamd", 0 , 0); #else openlog("bootparamd", 0 , LOG_DAEMON); setlogmask(LOG_UPTO(LOG_NOTICE)); #endif break; default: usage(); } if ( stat(bootpfile, &buf ) ) err(1, "%s", bootpfile); if (route_addr == -1) { get_myaddress(&my_addr); bcopy(&my_addr.sin_addr.s_addr, &route_addr, sizeof (route_addr)); } if (!debug) { if (daemon(0,0)) err(1, "fork"); } (void)pmap_unset(BOOTPARAMPROG, BOOTPARAMVERS); transp = svcudp_create(RPC_ANYSOCK); if (transp == NULL) errx(1, "cannot create udp service"); if (!svc_register(transp, BOOTPARAMPROG, BOOTPARAMVERS, bootparamprog_1, IPPROTO_UDP)) errx(1, "unable to register (BOOTPARAMPROG, BOOTPARAMVERS, udp)"); svc_run(); errx(1, "svc_run returned"); } static void usage() { fprintf(stderr, "usage: bootparamd [-d] [-s] [-r router] [-f bootparmsfile]\n"); exit(1); }