From 3b813696301bbb774b38bf6f43bff168dc0d756a Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 3 Jan 2009 00:00:24 +0100 Subject: [PATCH] Numerous adjustments to the recent rpcbind etc. changes. --- Makefile_upgrade.inc | 2 ++ lib/libc/net/getnetent.3 | 1 - lib/libc/rpc/rpc.3 | 10 ++++------ lib/libc/rpc/rpc.5 | 2 +- sbin/mountd/mountd.8 | 2 +- sbin/nfsiod/nfsiod.8 | 2 +- share/man/man5/rc.conf.5 | 4 ++-- share/man/man9/Makefile | 3 +-- share/man/man9/ktr.9 | 13 ++----------- usr.sbin/jail/jail.8 | 8 ++++---- 10 files changed, 18 insertions(+), 29 deletions(-) diff --git a/Makefile_upgrade.inc b/Makefile_upgrade.inc index 8cec51727b..e91ec455db 100644 --- a/Makefile_upgrade.inc +++ b/Makefile_upgrade.inc @@ -1011,3 +1011,5 @@ TO_REMOVE+=/usr/share/man/cat3/svc_getregset.3.gz TO_REMOVE+=/usr/share/man/man3/svc_getregset.3.gz TO_REMOVE+=/usr/share/man/cat3/xdr_authunix_parms.3.gz TO_REMOVE+=/usr/share/man/man3/xdr_authunix_parms.3.gz +TO_REMOVE+=/usr/share/man/cat9/KTR_LOG_PTR.9.gz +TO_REMOVE+=/usr/share/man/man9/KTR_LOG_PTR.9.gz diff --git a/lib/libc/net/getnetent.3 b/lib/libc/net/getnetent.3 index 8ec33a70c6..aae104e1bf 100644 --- a/lib/libc/net/getnetent.3 +++ b/lib/libc/net/getnetent.3 @@ -76,7 +76,6 @@ or entries supplied by the system. The order of the lookups is controlled by the `networks' entry in .Xr nsswitch.conf 5 . -.Pp .Bd -literal -offset indent struct netent { char *n_name; /* official name of net */ diff --git a/lib/libc/rpc/rpc.3 b/lib/libc/rpc/rpc.3 index 0a92a3690e..fb9fe633ad 100644 --- a/lib/libc/rpc/rpc.3 +++ b/lib/libc/rpc/rpc.3 @@ -376,8 +376,6 @@ pages on which they are described: .Xr rpc_clnt_create 3 .It Fn clnt_tp_create_timed .Xr rpc_clnt_create 3 -.It Fn clnt_udpcreate -.Xr rpc_soc 3 .It Fn clnt_vc_create .Xr rpc_clnt_create 3 .It Fn clntraw_create @@ -386,6 +384,8 @@ pages on which they are described: .Xr rpc_soc 3 .It Fn clntudp_bufcreate .Xr rpc_soc 3 +.It Fn clntudp_create +.Xr rpc_soc 3 .It Fn get_myaddress .Xr rpc_soc 3 .It Fn pmap_getmaps @@ -418,8 +418,6 @@ pages on which they are described: .Xr rpc_svc_calls 3 .It Fn svc_fd_create .Xr rpc_svc_create 3 -.It Fn svc_fds -.Xr rpc_soc 3 .It Fn svc_freeargs .Xr rpc_svc_reg 3 .It Fn svc_getargs @@ -432,8 +430,8 @@ pages on which they are described: .Xr rpc_svc_calls 3 .It Fn svc_getrpccaller .Xr rpc_svc_calls 3 -.It Fn svc_kerb_reg -.Xr kerberos_rpc 3 +.\".It Fn svc_kerb_reg +.\".Xr kerberos_rpc 3 .It Fn svc_raw_create .Xr rpc_svc_create 3 .It Fn svc_reg diff --git a/lib/libc/rpc/rpc.5 b/lib/libc/rpc/rpc.5 index 1517d5dae2..b0575e12ea 100644 --- a/lib/libc/rpc/rpc.5 +++ b/lib/libc/rpc/rpc.5 @@ -44,7 +44,7 @@ Below is an example of an RPC database: # # rpc # -rpcbind 100000 portmap sunrpc portmapper +rpcbind 100000 portmap sunrpc rpcbind rusersd 100002 rusers nfs 100003 nfsprog mountd 100005 mount showmount diff --git a/sbin/mountd/mountd.8 b/sbin/mountd/mountd.8 index d16d4fbd4e..1a37368f40 100644 --- a/sbin/mountd/mountd.8 +++ b/sbin/mountd/mountd.8 @@ -144,7 +144,7 @@ the current list of remote mounted filesystems .Xr exports 5 , .Xr kldload 8 , .Xr nfsd 8 , -.Xr portmap 8 , +.Xr rpcbind 8 , .Xr showmount 8 .Sh HISTORY The diff --git a/sbin/nfsiod/nfsiod.8 b/sbin/nfsiod/nfsiod.8 index 223272e6eb..20d829ce1f 100644 --- a/sbin/nfsiod/nfsiod.8 +++ b/sbin/nfsiod/nfsiod.8 @@ -86,7 +86,7 @@ utility exits with an error. .Xr kldload 8 , .Xr mountd 8 , .Xr nfsd 8 , -.Xr portmap 8 +.Xr rpcbind 8 .Sh HISTORY The .Nm diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 593385fa81..628125aede 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -1390,7 +1390,7 @@ these are the flags to pass to .Pq Vt str Path to program for rpcbind daemon (default -.Pa /usr/sbin/portmap ) . +.Pa /usr/sbin/rpcbind ) . .It Va rpcbind_enable .Pq Vt bool If set to @@ -2896,7 +2896,6 @@ has not completed within the specified time (in seconds). .Xr pcnfsd 8 , .Xr pfctl 8 , .Xr pflogd 8 , -.Xr portmap 8 , .Xr quotacheck 8 , .Xr quotaon 8 , .Xr rc 8 , @@ -2905,6 +2904,7 @@ has not completed within the specified time (in seconds). .Xr rndcontrol 8 , .Xr route 8 , .Xr routed 8 , +.Xr rpcbind 8 , .Xr rpc.lockd 8 , .Xr rpc.statd 8 , .Xr rtadvd 8 , diff --git a/share/man/man9/Makefile b/share/man/man9/Makefile index 9028eb880e..f903f9ea73 100644 --- a/share/man/man9/Makefile +++ b/share/man/man9/Makefile @@ -423,8 +423,7 @@ MLINKS+=ksignal.9 gsignal.9 \ ksignal.9 pgsignal.9 MLINKS+=ktr.9 KTR_INFO.9 \ ktr.9 KTR_INFO_MASTER.9 \ - ktr.9 KTR_LOG.9 \ - ktr.9 KTR_LOG_PTR.9 + ktr.9 KTR_LOG.9 MLINKS+=lock.9 lockcount.9 \ lock.9 lockcountnb.9 \ lock.9 lockinit.9 \ diff --git a/share/man/man9/ktr.9 b/share/man/man9/ktr.9 index baa5c071e9..e85d403000 100644 --- a/share/man/man9/ktr.9 +++ b/share/man/man9/ktr.9 @@ -31,8 +31,7 @@ .Sh NAME .Nm KTR_INFO_MASTER , .Nm KTR_INFO , -.Nm KTR_LOG , -.Nm KTR_LOG_PTR +.Nm KTR_LOG .Nd kernel tracing facility .Sh SYNOPSIS .In sys/ktr.h @@ -42,7 +41,6 @@ .Fn KTR_INFO_MASTER "master" .Fn KTR_INFO "compile" "master" "name" "maskbit" "format" "datasize" .Fn KTR_LOG "info" "arg ..." -.Fn KTR_LOG_PTR "info" "ptr" .Sh DESCRIPTION The .Nm ktr @@ -91,9 +89,7 @@ is currently unused and can be set to 0. .Pp Kernel events are logged via the .Fn KTR_LOG -and -.Fn KTR_LOG_PTR -macros. +macro. The .Fa info parameter is an identifier of the format @@ -106,11 +102,6 @@ arguments as required by the string passed to the associated .Fn KTR_INFO call. -The -.Fn KTR_LOG_PTR -macro behaves similarly but takes a single data pointer -.Fa ptr -instead. .Pp The .Va ktr_entries diff --git a/usr.sbin/jail/jail.8 b/usr.sbin/jail/jail.8 index 6d8f1829cd..0568d70ae6 100644 --- a/usr.sbin/jail/jail.8 +++ b/usr.sbin/jail/jail.8 @@ -151,7 +151,7 @@ in the host environment: .Bd -literal -offset indent sendmail_enable="NO" inetd_flags="-wW -a 192.168.11.23" -portmap_enable="NO" +rpcbind_enable="NO" .Ed .Pp .Li 192.168.11.23 @@ -175,7 +175,7 @@ This includes .Xr sendmail 8 , .Xr named 8 , and -.Xr portmap 8 . +.Xr rpcbind 8 . While .Xr sendmail 8 and @@ -223,7 +223,7 @@ to quell startup warnings about missing fstab .It Disable the port mapper .Pa ( /etc/rc.conf : -.Li portmap_enable="NO" ) +.Li rpcbind_enable="NO" ) .It Run .Xr newaliases 1 @@ -413,9 +413,9 @@ by setting this MIB entry to 1. .Xr halt 8 , .Xr inetd 8 , .Xr named 8 , -.Xr portmap 8 , .Xr pw 8 , .Xr reboot 8 , +.Xr rpcbind 8 , .Xr sendmail 8 , .Xr shutdown 8 , .Xr sysctl 8 , -- 2.41.0