--- ./oafd/Makefile.am	Wed Sep 26 13:44:07 2001
+++ ../oaf-0.6.10/./oafd/Makefile.am	Thu Jun 13 16:56:31 2002
@@ -36,7 +36,7 @@
 	oafd.h
 
 LDADD=../liboaf/liboaf.la \
-	@ORBIT_LIBS@ -lORBitCosNaming -lname-server \
+	-lname-server -lORBitCosNaming @ORBIT_LIBS@ \
 	@XML_LIBS@ \
 	@INTLLIBS@ \
 	@GLIB_LIBS@
--- ./oafd/Makefile.in	Tue Apr 16 06:37:29 2002
+++ ../oaf-0.6.10/./oafd/Makefile.in	Thu Jun 13 16:56:50 2002
@@ -141,7 +141,7 @@
 oafd_SOURCES =  	oafd-corba-extensions.c				oafd-corba-extensions.h				qsort_ex.c					qsort_ex.h					oaf-skels.c					ac-query-lex.c					ac-query-parse.c				ac-query-parse.h				ac-query-expr.h					ac-corba.c					ac-query-expr.c					od-corba.c					od-load.c					od-utils.c					od-activate.c					main.c						od-utils.h					oafd.h
 
 
-LDADD = ../liboaf/liboaf.la 	@ORBIT_LIBS@ -lORBitCosNaming -lname-server 	@XML_LIBS@ 	@INTLLIBS@ 	@GLIB_LIBS@
+LDADD = ../liboaf/liboaf.la 	-lname-server -lORBitCosNaming @ORBIT_LIBS@	@XML_LIBS@ 	@INTLLIBS@ 	@GLIB_LIBS@
 
 
 oaf_client_SOURCES = client.c
--- ./oafd/ac-query-expr.c	Wed Sep 26 13:44:07 2001
+++ ../oaf-0.6.10/./oafd/ac-query-expr.c	Thu Jun 13 16:57:45 2002
@@ -514,6 +514,8 @@
 	fi = &qexp_func_impls[i];
 	if (!fi->name) {
 		g_warning ("Invalid function name '%s'", func_name);
+		retval.value_known = FALSE;
+		retval.needs_free = FALSE;
 		return retval;
 	}
 
--- ./liboaf/oaf-mainloop.c	Tue Mar 12 12:05:03 2002
+++ ../oaf-0.6.10/./liboaf/oaf-mainloop.c	Thu Jun 13 16:58:53 2002
@@ -173,7 +173,7 @@
 oaf_internal_activation_context_get_extended (gboolean           existing_only,
                                               CORBA_Environment *ev)
 {
-	OAFBaseService base_service = {};
+	OAFBaseService base_service = { 0 };
 
 	base_service.name = "IDL:OAF/ActivationContext:1.0";
 	base_service.session_name = oaf_session_name_get ();
@@ -186,7 +186,7 @@
 CORBA_Object
 oaf_activation_context_get (void)
 {
-	OAFBaseService base_service = {};
+	OAFBaseService base_service = { 0 };
 
 	base_service.name = "IDL:OAF/ActivationContext:1.0";
 	base_service.session_name = oaf_session_name_get ();
@@ -200,7 +200,7 @@
                           const char *hostname,
                           const char *domain)
 {
-        OAFBaseService base_service = {};
+        OAFBaseService base_service = { 0 };
 
         base_service.name = "IDL:OAF/ObjectDirectory:1.0";
         base_service.session_name = oaf_session_name_get ();