summaryrefslogtreecommitdiff
path: root/libexec
diff options
context:
space:
mode:
authorbrezak <brezak@NetBSD.org>1993-06-04 15:50:38 +0000
committerbrezak <brezak@NetBSD.org>1993-06-04 15:50:38 +0000
commit37e75f766cafbfea6477599bc89ba8a7985c13d3 (patch)
tree70625f41198dba61bc4777c9b375cb53eaf0967e /libexec
parentdb60ef9d46ce4122d123c90983b282772b10a0da (diff)
Only cleanup registrations if not started by inetd.
Diffstat (limited to 'libexec')
-rw-r--r--libexec/rpc.rstatd/rstatd.c10
-rw-r--r--libexec/rpc.rusersd/rusersd.c8
2 files changed, 9 insertions, 9 deletions
diff --git a/libexec/rpc.rstatd/rstatd.c b/libexec/rpc.rstatd/rstatd.c
index 6b1fbac604e..341d5cb14e3 100644
--- a/libexec/rpc.rstatd/rstatd.c
+++ b/libexec/rpc.rstatd/rstatd.c
@@ -65,7 +65,7 @@ main(argc, argv)
closedown = atoi(argv[1]);
if (closedown <= 0)
closedown = 20;
-#if 1
+
/*
* See if inetd started us
*/
@@ -81,8 +81,11 @@ main(argc, argv)
(void)pmap_unset(RSTATPROG, RSTATVERS_TIME);
(void)pmap_unset(RSTATPROG, RSTATVERS_SWTCH);
(void)pmap_unset(RSTATPROG, RSTATVERS_ORIG);
+
+ (void) signal(SIGINT, cleanup);
+ (void) signal(SIGTERM, cleanup);
+ (void) signal(SIGHUP, cleanup);
}
-#endif
openlog("rpc.rusersd", LOG_PID, LOG_DAEMON);
@@ -103,9 +106,6 @@ main(argc, argv)
syslog(LOG_ERR, "unable to register (RSTATPROG, RSTATVERS_ORIG, udp).");
exit(1);
}
- (void) signal(SIGINT, cleanup);
- (void) signal(SIGTERM, cleanup);
- (void) signal(SIGHUP, cleanup);
svc_run();
syslog(LOG_ERR, "svc_run returned");
diff --git a/libexec/rpc.rusersd/rusersd.c b/libexec/rpc.rusersd/rusersd.c
index f85a7bd9ce7..40809076bcc 100644
--- a/libexec/rpc.rusersd/rusersd.c
+++ b/libexec/rpc.rusersd/rusersd.c
@@ -75,6 +75,10 @@ main(argc, argv)
(void) pmap_unset(RUSERSPROG, RUSERSVERS_IDLE);
(void) pmap_unset(RUSERSPROG, RUSERSVERS_ORIG);
+
+ (void) signal(SIGINT, cleanup);
+ (void) signal(SIGTERM, cleanup);
+ (void) signal(SIGHUP, cleanup);
}
openlog("rpc.rusersd", LOG_PID, LOG_DAEMON);
@@ -93,10 +97,6 @@ main(argc, argv)
syslog(LOG_ERR, "unable to register (RUSERSPROG, RUSERSVERS_ORIG, %s).", proto?"udp":"(inetd)");
exit(1);
}
-
- (void) signal(SIGINT, cleanup);
- (void) signal(SIGTERM, cleanup);
- (void) signal(SIGHUP, cleanup);
svc_run();
syslog(LOG_ERR, "svc_run returned");