From 9b38087fa886b4723c4fa4cd456cd88e0005c067 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 22 Aug 2005 20:07:52 +0000
Subject: [PATCH] fixed problem where a NULL unixconfig was causing segfault
 took the sleep out of the apachemods makefile

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1694 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/apachemods/Makefile             | 10 +++++-----
 OpenSRF/src/libstack/osrf_system.c           |  1 +
 OpenSRF/src/libtransport/transport_session.c |  5 ++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Open-ILS/src/apachemods/Makefile b/Open-ILS/src/apachemods/Makefile
index 4a99272358..da90b63a89 100644
--- a/Open-ILS/src/apachemods/Makefile
+++ b/Open-ILS/src/apachemods/Makefile
@@ -25,18 +25,18 @@ xmltools.o:	xmltools.c xmltools.h
 mod_xmltools-install:
 	echo $@
 	$(APXS2) -i -a -n mod_xmltools mod_xmltools.so
-	@echo "-----------------------------------------------";
-	@echo -e "* Important * : Change httpd.conf from this: \n \
+	echo "-----------------------------------------------";
+	echo -e "* Important * : Change httpd.conf from this: \n \
 		LoadModule mod_xmltools_module modules/mod_xmltools.so \n \
 		to this: \n \
 		LoadModule mod_xmltools    modules/mod_xmltools.so"
-	@echo -e "Supported configuration options:\
+	echo -e "Supported configuration options:\
 			\nXMLToolsDefaultLocale <locale>\
 			\nXMLToolsLocaleDir  <web-locale-dir>\
 			\nXMLToolsPreXSL <pre_xsl_file>\
 			\nXMLToolsPostXSL <post_xsl_file>"
-	@echo "-----------------------------------------------";
-	@sleep 3;
+	echo "-----------------------------------------------";
+	echo ""
 
 clean:
 	echo $@
diff --git a/OpenSRF/src/libstack/osrf_system.c b/OpenSRF/src/libstack/osrf_system.c
index 8c8ced8ddd..92ddb48b34 100644
--- a/OpenSRF/src/libstack/osrf_system.c
+++ b/OpenSRF/src/libstack/osrf_system.c
@@ -33,6 +33,7 @@ int osrf_system_bootstrap_client( char* config_file, char* contextnode ) {
 	info_handler("Bootstrapping system with domain %s, port %d, and unixpath %s", domain, iport, unixpath );
 
 	transport_client* client = client_init( domain, iport, unixpath, 0 );
+	
 	char buf[256];
 	memset(buf,0,256);
 	char* host = getenv("HOSTNAME");
diff --git a/OpenSRF/src/libtransport/transport_session.c b/OpenSRF/src/libtransport/transport_session.c
index 07bdad0135..44f88a8e9c 100644
--- a/OpenSRF/src/libtransport/transport_session.c
+++ b/OpenSRF/src/libtransport/transport_session.c
@@ -68,7 +68,10 @@ transport_session* init_transport(  char* server,
 	
 	session->port = port;
 	session->server = strdup(server);
-	session->unix_path = strdup(unix_path);
+	if(unix_path)
+		session->unix_path = strdup(unix_path);
+	session->unix_path = NULL;
+
 	session->sock_id = 0;
 
 	/* this will be handed back to us in callbacks */
-- 
2.43.2