diff options
| author | mycroft <mycroft@NetBSD.org> | 1995-01-13 06:14:28 +0000 |
|---|---|---|
| committer | mycroft <mycroft@NetBSD.org> | 1995-01-13 06:14:28 +0000 |
| commit | 002aa598e1cd9ac124ef29ac415988e8583e32db (patch) | |
| tree | b38e245e2897d8c18fb3ba6f1f126c518f2e9067 /libexec | |
| parent | edcbc4e64cb3b47b42c37c7f3a3827d2a7c9f249 (diff) | |
Correct calling sequence of getsockname(2).
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/rpc.rquotad/rquotad.c | 9 | ||||
| -rw-r--r-- | libexec/rpc.rstatd/rstatd.c | 3 | ||||
| -rw-r--r-- | libexec/rpc.rusersd/rusersd.c | 3 | ||||
| -rw-r--r-- | libexec/rpc.rwalld/rwalld.c | 3 | ||||
| -rw-r--r-- | libexec/rpc.sprayd/sprayd.c | 5 |
5 files changed, 16 insertions, 7 deletions
diff --git a/libexec/rpc.rquotad/rquotad.c b/libexec/rpc.rquotad/rquotad.c index e94eade6cd0..7127a774653 100644 --- a/libexec/rpc.rquotad/rquotad.c +++ b/libexec/rpc.rquotad/rquotad.c @@ -60,20 +60,25 @@ main(argc, argv) struct sockaddr_in from; int fromlen; - openlog("rquotad", LOG_PID, LOG_DAEMON); - if (getsockname(0, (struct sockaddr *) & from, &fromlen) < 0) { + fromlen = sizeof(from); + if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { from_inetd = 0; sock = RPC_ANYSOCK; proto = IPPROTO_UDP; } + if (!from_inetd) { daemon(0, 0); + pmap_unset(RQUOTAPROG, RQUOTAVERS); + signal(SIGINT, exit_svc); /* trap some signals */ signal(SIGQUIT, exit_svc); /* to unregister the service */ signal(SIGTERM, exit_svc); /* before exiting */ } + openlog("rpc.rquotad", LOG_PID, LOG_DAEMON); + /* create and register the service */ if ((transport = svcudp_create(sock)) == NULL) { syslog(LOG_ERR, "couldn't create UDP transport"); diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c index 23afa42d934..a1855594d21 100644 --- a/libexec/rpc.rstatd/rstatd.c +++ b/libexec/rpc.rstatd/rstatd.c @@ -32,7 +32,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rstatd.c,v 1.5 1994/02/22 15:37:19 pk Exp $"; +static char rcsid[] = "$Id: rstatd.c,v 1.6 1995/01/13 06:14:31 mycroft Exp $"; #endif /* not lint */ #include <stdio.h> @@ -73,6 +73,7 @@ main(argc, argv) /* * See if inetd started us */ + fromlen = sizeof(from); if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { from_inetd = 0; sock = RPC_ANYSOCK; diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c index bbf401ece06..e4902523f68 100644 --- a/libexec/rpc.rusersd/rusersd.c +++ b/libexec/rpc.rusersd/rusersd.c @@ -27,7 +27,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rusersd.c,v 1.6 1994/07/11 21:51:58 mycroft Exp $"; +static char rcsid[] = "$Id: rusersd.c,v 1.7 1995/01/13 06:14:32 mycroft Exp $"; #endif /* not lint */ #include <stdio.h> @@ -62,6 +62,7 @@ main(argc, argv) /* * See if inetd started us */ + fromlen = sizeof(from); if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { from_inetd = 0; sock = RPC_ANYSOCK; diff --git a/libexec/rpc.rwalld/rwalld.c b/libexec/rpc.rwalld/rwalld.c index 4bc249a3e9f..5fa62c171d0 100644 --- a/libexec/rpc.rwalld/rwalld.c +++ b/libexec/rpc.rwalld/rwalld.c @@ -28,7 +28,7 @@ */ #ifndef lint -static char rcsid[] = "$Id: rwalld.c,v 1.3 1994/12/23 14:29:43 cgd Exp $"; +static char rcsid[] = "$Id: rwalld.c,v 1.4 1995/01/13 06:14:34 mycroft Exp $"; #endif /* not lint */ #include <unistd.h> @@ -84,6 +84,7 @@ main(argc, argv) /* * See if inetd started us */ + fromlen = sizeof(from); if (getsockname(0, (struct sockaddr *)&sa, &salen) < 0) { from_inetd = 0; sock = RPC_ANYSOCK; diff --git a/libexec/rpc.sprayd/sprayd.c b/libexec/rpc.sprayd/sprayd.c index bd9f9615393..95517751e4f 100644 --- a/libexec/rpc.sprayd/sprayd.c +++ b/libexec/rpc.sprayd/sprayd.c @@ -27,11 +27,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: sprayd.c,v 1.2 1994/06/24 08:17:42 deraadt Exp $ + * $Id: sprayd.c,v 1.3 1995/01/13 06:14:37 mycroft Exp $ */ #ifndef lint -static char rcsid[] = "$Id: sprayd.c,v 1.2 1994/06/24 08:17:42 deraadt Exp $"; +static char rcsid[] = "$Id: sprayd.c,v 1.3 1995/01/13 06:14:37 mycroft Exp $"; #endif /* not lint */ #include <stdio.h> @@ -69,6 +69,7 @@ main(argc, argv) /* * See if inetd started us */ + fromlen = sizeof(from); if (getsockname(0, (struct sockaddr *)&from, &fromlen) < 0) { from_inetd = 0; sock = RPC_ANYSOCK; |
