From 4b8a6dc2f049fe9e02490ca8f9505a3a693a7014 Mon Sep 17 00:00:00 2001
From: hunt <hunt>
Date: Wed, 5 Apr 2006 19:56:50 +0000
Subject: 2006-04-05  Martin Hunt  <hunt@redhat.com>

	* librelay.c (merge_output): Set the output filename if necessary.
	* stpd.c (main): Don't reset output_filename just because
	relayfs is possible. Move that code to librelay.c.
---
 runtime/stpd/stpd.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'runtime/stpd/stpd.c')

diff --git a/runtime/stpd/stpd.c b/runtime/stpd/stpd.c
index 54447b56..0b36fbb7 100644
--- a/runtime/stpd/stpd.c
+++ b/runtime/stpd/stpd.c
@@ -55,9 +55,6 @@ gid_t cmd_gid;
 static char stpd_filebase[1024];
 #define RELAYFS_MAGIC			0xF0B4A981
 
-/* if no output file name is specified, use this */
-#define DEFAULT_OUTFILE_NAME "probe.out"
-
 /* stp_check script */
 #ifdef PKGLIBDIR
 char *stp_check=PKGLIBDIR "/stp_check";
@@ -91,7 +88,7 @@ int main(int argc, char **argv)
 	int c, status;
 	pid_t pid;
 	struct statfs st;
-
+	
 	while ((c = getopt(argc, argv, "mpqrb:n:t:d:c:vo:u:")) != EOF)
 	{
 		switch (c) {
@@ -209,8 +206,6 @@ int main(int argc, char **argv)
 			fprintf(stderr, "Could not execute %s\n", stp_check);
 			exit(1);
 		}
-		if (!outfile_name)
-			outfile_name = DEFAULT_OUTFILE_NAME;
 	}
 
 	if (statfs("/mnt/relay", &st) == 0
-- 
cgit