[stsf-commit] stsf/STClientLibrary/src makefile, 1.5, 1.6 serverconnection.c, 1.3, 1.4

[Alexander Gelfenbain]

Committed by: adg


Index: makefile
===================================================================
RCS file: /cvs/stsf/stsf/STClientLibrary/src/makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/makefile	12 Apr 2004 22:49:24 -0000	1.5
+++ b/makefile	25 May 2004 21:08:21 -0000	1.6
@@ -125,13 +125,13 @@
 	rm -f *.bak *.o *.d *.so *.so.1 *~ *core makefile.dependencies *_pure*
 	rm -f libtest glyphmanagertest stperf
 
--include makefile.dependencies
+###-include makefile.dependencies
 
-depends: makefile.dependencies
+###depends: makefile.dependencies
 
-makefile.dependencies: 
-	touch makefile.dependencies
-	makedepend -f makefile.dependencies $(INCLUDE) $(SRCS)
+###makefile.dependencies: 
+###	touch makefile.dependencies
+###	makedepend -f makefile.dependencies $(INCLUDE) $(SRCS)
 
 # Temporary for setting up font & scaler paths until fontserver is standalone
 connection.o: CFLAGS += $(FONTCONFIG_CFLAGS) -DDEFAULTSCALERPATH=\"$(DEFAULT_SCALER_PATH)\"

Index: serverconnection.c
===================================================================
RCS file: /cvs/stsf/stsf/STClientLibrary/src/serverconnection.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/serverconnection.c	25 May 2004 02:47:24 -0000	1.3
+++ b/serverconnection.c	25 May 2004 21:08:21 -0000	1.4
@@ -309,7 +309,7 @@
     door_desc_t *desc_ptr = NULL;
     uint_t desc_num = 0;
     int ret;
-    char *doorbuf;
+    char *doorbuf = NULL;
     size_t doorbufsize = DOORBUFMAXSIZE;
     SharedMemoryHeader *sh;
 
@@ -395,7 +395,7 @@
         goto cleanup3; /* XXX */
     }
     ro = (DoorRequestOut *) s->doorbuf;
-    if (desc_num != 1 && ro->cid != cid && ro->ret != ST_OK) {
+    if (desc_num != 1 || ro->cid != cid || ro->ret != ST_OK) {
         ErrorStr("%s: protocol error on CONNECT", __func__);
         t = ST_PROTO_ERROR;
         goto cleanup2;