diff --git a/vtysh/ChangeLog b/vtysh/ChangeLog
index e4908b4..3ad1c25 100644
--- a/vtysh/ChangeLog
+++ b/vtysh/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-21 Paul Jakma <paul.jakma@sun.com>
+
+	* vtysh.c: (vtysh_show_logging_cmd) Suppress output for daemons
+	  which are not running (Andrew Schorr).
+
 2006-05-17 Paul Jakma <paul.jakma@sun.com>
 
 	* vtysh.c: (general) Add 'show logging' command.
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index a2115fa..2dbb533 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -1323,12 +1323,14 @@
   char line[] = "show logging\n";
   
   for (i = 0; i < VTYSH_INDEX_MAX; i++)
-    {
-      fprintf (stdout,"Logging configuration for %s:\n", vtysh_client[i].name);
-      ret = vtysh_client_execute (&vtysh_client[i], line, stdout);
-      fprintf (stdout,"\n");
-    }
-        
+    if ( vtysh_client[i].fd >= 0 )
+      {
+        fprintf (stdout,"Logging configuration for %s:\n", 
+                 vtysh_client[i].name);
+        ret = vtysh_client_execute (&vtysh_client[i], line, stdout);
+        fprintf (stdout,"\n");
+      }
+  
   return ret;
 }