summaryrefslogtreecommitdiff
path: root/netsvcs
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1997-01-08 00:06:10 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1997-01-08 00:06:10 +0000
commitc74f8ce745a8d81101b4da0be11f448704d53c46 (patch)
tree31e6b83e17ad25bbe82cd48f27eeca036e5dbe73 /netsvcs
parentf9c477469e3c82edbf12a7e1f2eca7422e7f0d1f (diff)
downloadATCD-c74f8ce745a8d81101b4da0be11f448704d53c46.tar.gz
foo
Diffstat (limited to 'netsvcs')
-rw-r--r--netsvcs/clients/Naming/Client/svc.conf2
-rw-r--r--netsvcs/servers/Makefile2
-rw-r--r--netsvcs/servers/main.cpp3
-rw-r--r--netsvcs/servers/svc.conf16
4 files changed, 12 insertions, 11 deletions
diff --git a/netsvcs/clients/Naming/Client/svc.conf b/netsvcs/clients/Naming/Client/svc.conf
index 45831c1aae6..151c996a238 100644
--- a/netsvcs/clients/Naming/Client/svc.conf
+++ b/netsvcs/clients/Naming/Client/svc.conf
@@ -1,6 +1,6 @@
# Note that $DB and $PORT are environment variables that are
# automatically interpreted and substituted by ACE!
static ACE_Naming_Context "main -s $DB -p $PORT -h tango"
-dynamic Name_Server_test Service_Object * ./libClient_Test:_make_Client_Test ()
+dynamic Name_Server_test Service_Object * ./Client_Test:_make_Client_Test ()
# Note: Client_Test must come after ACE_Naming_Context since it relies
# on the ACE_Naming_Context having been linked...
diff --git a/netsvcs/servers/Makefile b/netsvcs/servers/Makefile
index 31f354a4740..bbe432d11cd 100644
--- a/netsvcs/servers/Makefile
+++ b/netsvcs/servers/Makefile
@@ -16,7 +16,7 @@ LSRC = $(addsuffix .cpp,$(FILES))
LOBJ = $(LSRC:%.cpp=$(VDIR)%.o)
SHOBJ = $(addsuffix .so,$(FILES))
-LDLIBS = -lnet_svcs
+LDLIBS = -lnetsvcs
VLDLIBS = $(LDLIBS:%=%$(VAR))
diff --git a/netsvcs/servers/main.cpp b/netsvcs/servers/main.cpp
index 67c5c9f3b57..5cd9150f744 100644
--- a/netsvcs/servers/main.cpp
+++ b/netsvcs/servers/main.cpp
@@ -38,7 +38,8 @@ main (int argc, char *argv[])
// Register ourselves to receive SIGINT and SIGQUIT so we can shut
// down gracefully via signals.
- ACE_Service_Config::reactor ()->register_handler (sig_set, &sa);
+ if (ACE_Service_Config::reactor ()->register_handler (sig_set, &sa) == -1)
+ ACE_ERROR_RETURN ((LM_ERROR, "%p\n", -1));
// Try to link in the svc.conf entries dynamically.
if (daemon.open (argc, argv) == -1)
diff --git a/netsvcs/servers/svc.conf b/netsvcs/servers/svc.conf
index 7d9e904e229..1da53470fa8 100644
--- a/netsvcs/servers/svc.conf
+++ b/netsvcs/servers/svc.conf
@@ -1,5 +1,5 @@
# These are the services that can be linked into ACE.
-# Note that you can replace the hardcoded "../lib/net_svcs" with
+# Note that you can replace the hardcoded "../lib/netsvcs" with
# a relative path if you set your LD search path correctly -- ACE will
# locate this for you automatically by reading your LD search path.
# Moreover, ACE will automatically insert the correct suffix (e.g.,
@@ -7,11 +7,11 @@
# "-p 20xxx" with "-p $PORTxxx" if you set your environment variables
# correctly.
-dynamic Logger Service_Object * ../lib/net_svcs:_make_ACE_Logging_Strategy() "-s foobar -f STDERR|OSTREAM"
-dynamic Time_Service Service_Object * ../lib/net_svcs:_make_ACE_TS_Server_Acceptor() "-p 10222"
-dynamic Name_Server Service_Object * ../lib/net_svcs:_make_ACE_Name_Acceptor() "-p 10012"
-dynamic Token_Service Service_Object * ../lib/net_svcs:_make_ACE_Token_Acceptor() "-p 10202"
-dynamic Server_Logging_Service Service_Object * ../lib/net_svcs:_make_ACE_Server_Logging_Acceptor() active "-p 10009"
-dynamic Thr_Server_Logging_Service Service_Object * ../lib/net_svcs:_make_ACE_Thr_Server_Logging_Acceptor() active "-p 10020"
-dynamic Client_Logging_Service Service_Object * ../lib/net_svcs:_make_ACE_Client_Logging_Connector() active "-p 10009"
+dynamic Logger Service_Object * ../lib/netsvcs:_make_ACE_Logging_Strategy() "-s foobar -f STDERR|OSTREAM"
+dynamic Time_Service Service_Object * ../lib/netsvcs:_make_ACE_TS_Server_Acceptor() "-p 10222"
+dynamic Name_Server Service_Object * ../lib/netsvcs:_make_ACE_Name_Acceptor() "-p 10012"
+dynamic Token_Service Service_Object * ../lib/netsvcs:_make_ACE_Token_Acceptor() "-p 10202"
+dynamic Server_Logging_Service Service_Object * ../lib/netsvcs:_make_ACE_Server_Logging_Acceptor() active "-p 10009"
+dynamic Thr_Server_Logging_Service Service_Object * ../lib/netsvcs:_make_ACE_Thr_Server_Logging_Acceptor() active "-p 10020"
+dynamic Client_Logging_Service Service_Object * ../lib/netsvcs:_make_ACE_Client_Logging_Connector() active "-p 10009"