|
From: Dave H. <hel...@us...> - 2012-10-24 05:01:31
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv11708
Modified Files:
ChangeLog NEWS msgqueue.c
Log Message:
[ 3579637 ] SFCB should check ftok return code
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.718
retrieving revision 1.719
diff -u -d -r1.718 -r1.719
--- NEWS 6 Oct 2012 01:19:15 -0000 1.718
+++ NEWS 24 Oct 2012 05:01:28 -0000 1.719
@@ -19,6 +19,7 @@
- 3574169 revert interop2 stageschema
- 3573507 CreateInstance for IndicationFilter doesn't accept DMTF:CQL
- 3574936 --disable-debug still allocates trace variables
+- 3579637 SFCB should check ftok return code
Changes in 1.3.15
=================
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -d -r1.803 -r1.804
--- ChangeLog 6 Oct 2012 01:19:15 -0000 1.803
+++ ChangeLog 24 Oct 2012 05:01:28 -0000 1.804
@@ -1,3 +1,8 @@
+2012-10-24 Dave Heller <hel...@us...>
+
+ * msgqueue.c
+ [ 3579637 ] SFCB should check ftok return code
+
2012-10-05 Chris Buccella <buc...@li...>
* cimcClientSfcbLocal.c, httpAdapter.c, indCIMXMLHandler.c,
Index: msgqueue.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/msgqueue.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- msgqueue.c 25 May 2012 22:26:13 -0000 1.40
+++ msgqueue.c 24 Oct 2012 05:01:28 -0000 1.41
@@ -118,10 +118,16 @@
int initSem(int https, int shttps, int provs)
{
+ _SFCB_ENTER(TRACE_MSGQUEUE, "initSem");
+
union semun sun;
int i;
- sfcbSemKey=ftok(SFCB_BINARY,'S');
+ if ((sfcbSemKey=ftok(SFCB_BINARY,'S')) <=0) {
+ mlogf(M_ERROR,M_SHOW,"-#- Error creating semaphore key using path: %s (%s)\n",
+ SFCB_BINARY, strerror(errno));
+ _SFCB_ABORT();
+ }
if ((sfcbSem=semget(sfcbSemKey,1, 0600))!=-1)
semctl(sfcbSem,0,IPC_RMID,sun);
@@ -149,7 +155,7 @@
semctl(sfcbSem,PROV_INUSE(i),SETVAL,sun);
semctl(sfcbSem,PROV_ALIVE(i),SETVAL,sun);
}
- return 0;
+ _SFCB_RETURN(0);
}
int remSem()
|