diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
| commit | 1b1ee5553889e207087539ddafa5dfd4e28bd585 (patch) | |
| tree | ba998dfb4fcad03e00a5cbf58e2a0ad648bab6e6 /sbin | |
| parent | b1a97daa1e06ab0de3071f979965878fd056292b (diff) | |
| download | FreeBSD-src-1b1ee5553889e207087539ddafa5dfd4e28bd585.zip FreeBSD-src-1b1ee5553889e207087539ddafa5dfd4e28bd585.tar.gz | |
Merge RELENG_2_0_5 into HEAD
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/mountd/mountd.c | 13 | ||||
| -rw-r--r-- | sbin/sysctl/sysctl.c | 4 |
2 files changed, 10 insertions, 7 deletions
diff --git a/sbin/mountd/mountd.c b/sbin/mountd/mountd.c index 0446087..4434244 100644 --- a/sbin/mountd/mountd.c +++ b/sbin/mountd/mountd.c @@ -43,7 +43,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)mountd.c 8.8 (Berkeley) 2/20/94";*/ static const char rcsid[] = - "$Id: mountd.c,v 1.6 1995/05/21 19:31:09 phk Exp $"; + "$Id: mountd.c,v 1.7.2.1 1995/06/08 04:34:11 davidg Exp $"; #endif /*not lint*/ #include <sys/param.h> @@ -236,7 +236,7 @@ main(argc, argv) int argc; char **argv; { - SVCXPRT *transp; + SVCXPRT *udptransp, *tcptransp; int c; struct vfsconf *vfc; @@ -295,13 +295,16 @@ main(argc, argv) fclose(pidfile); } } - if ((transp = svcudp_create(RPC_ANYSOCK)) == NULL) { + if ((udptransp = svcudp_create(RPC_ANYSOCK)) == NULL || + (tcptransp = svctcp_create(RPC_ANYSOCK, 0, 0)) == NULL) { syslog(LOG_ERR, "Can't create socket"); exit(1); } pmap_unset(RPCPROG_MNT, RPCMNT_VER1); - if (!svc_register(transp, RPCPROG_MNT, RPCMNT_VER1, mntsrv, - IPPROTO_UDP)) { + if (!svc_register(udptransp, RPCPROG_MNT, RPCMNT_VER1, mntsrv, + IPPROTO_UDP) || + !svc_register(tcptransp, RPCPROG_MNT, RPCMNT_VER1, mntsrv, + IPPROTO_TCP)) { syslog(LOG_ERR, "Can't register mount"); exit(1); } diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c index 4666cf6..25f404a 100644 --- a/sbin/sysctl/sysctl.c +++ b/sbin/sysctl/sysctl.c @@ -40,7 +40,7 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "From: @(#)sysctl.c 8.1 (Berkeley) 6/6/93"; */ static const char rcsid[] = - "$Id: sysctl.c,v 1.5 1995/05/12 19:10:56 wollman Exp $"; + "$Id: sysctl.c,v 1.6.2.1 1995/06/02 10:50:54 davidg Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -336,7 +336,7 @@ parse(string, flags) } if (bufp) { - fprintf(stderr, "name %s in %s is unknown\n", *bufp, string); + fprintf(stderr, "name %s in %s is unknown\n", bufp, string); return; } if (newsize > 0) { |
