1 files changed, 22 insertions, 11 deletions

diff --git a/src/progman.c b/src/progman.c
index 89be1f5..4743507 100644
--- a/src/progman.c
+++ b/src/progman.c
@@ -146,12 +146,19 @@ progman_lookup_component (const char *tag)
 }  
 
 struct component *
-progman_lookup_service (const char *service)
+progman_lookup_tcpmux (const char *service, const char *master)
 {
-  struct prog *prog = prog_lookup_by_service (service);
-  if (!prog)
-    return NULL;
-  return prog->v.p.comp;
+  struct prog *prog;
+  for (prog = proghead; prog; prog = prog->next)
+    if (IS_COMPONENT (prog)
+	&& ISCF_TCPMUX (prog->v.p.comp->flags)
+	&& !(prog->v.p.comp->flags & CF_DISABLED)
+	&& prog->v.p.comp->service
+	&& strcmp (prog->v.p.comp->service, service) == 0
+	&& prog->v.p.comp->tcpmux
+	&& strcmp (prog->v.p.comp->tcpmux, master) == 0)
+      return prog->v.p.comp;
+  return NULL;
 }
 
 struct prog *
@@ -775,7 +782,7 @@ prog_execute (struct prog *prog)
     {
       mf_proctitle_format ("inetd %s",
 			   prog->v.p.comp->builtin->service);
-      prog->v.p.comp->builtin->fun (0);
+      prog->v.p.comp->builtin->fun (0, prog->v.p.comp);
       _exit (0);
     }
       
@@ -862,7 +869,7 @@ prog_start (struct prog *prog)
 
   if (prog->v.p.comp->builtin && prog->v.p.comp->builtin->single_process)
     {
-      prog->v.p.comp->builtin->fun (prog->v.p.socket);
+      prog->v.p.comp->builtin->fun (prog->v.p.socket, prog->v.p.comp);
       return;
     }
   
@@ -1254,8 +1261,7 @@ progman_create_sockets ()
       if (IS_COMPONENT (prog))
 	{
 	  struct component *comp = prog->v.p.comp;
-	  if (comp->mode == pies_comp_inetd
-	      && !(comp->flags & (CF_TCPMUXPLUS | CF_TCPMUX)))
+	  if (comp->mode == pies_comp_inetd && !ISCF_TCPMUX (comp->flags))
 	    {
 	      int fd = create_socket (comp->socket_url,
 				      comp->socket_type,
@@ -1324,8 +1330,13 @@ progman_start ()
       {
 	if (prog->v.p.comp->mode == pies_comp_inetd)
 	  {
-	    prog->v.p.status = status_listener;
-	    enable_socket (prog->v.p.socket);
+	    if (prog->v.p.comp->flags & CF_DISABLED)
+	      disable_socket (prog->v.p.socket);
+	    else
+	      {
+		prog->v.p.status = status_listener;
+		enable_socket (prog->v.p.socket);
+	      }
 	  }
 	else if ((prog->v.p.status == status_enabled && prog->pid == 0)
 		 || prog->v.p.status == status_sleeping)