From: Dave H. <hel...@us...> - 2012-10-24 15:03:47
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "SFCB - Small Footprint CIM Broker". The branch, master has been updated via 1023f4ec4b3049b2bf895c5bf88a410eeff23973 (commit) from ead25ac6511a8638a437de38b7d20ae76fde74f6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1023f4ec4b3049b2bf895c5bf88a410eeff23973 Author: Dave Heller <hel...@us...> Date: Wed Oct 24 10:59:36 2012 -0400 [ 3579637 ] SFCB should check ftok return code ----------------------------------------------------------------------- Summary of changes: diff --git a/NEWS b/NEWS index 8fc5742..b5099bb 100644 --- a/NEWS +++ b/NEWS @@ -22,6 +22,7 @@ Bugs fixed: - 3564757 stageschema.sh should detect errors in sfcbrepos - 3567083 configure should fail if sfcUtil.so not found - 3573507 CreateInstance for IndicationFilter doesn't accept DMTF:CQL +- 3579637 SFCB should check ftok return code Changes in 1.4.2 ================ diff --git a/msgqueue.c b/msgqueue.c index 4bc51f5..3c5288d 100644 --- a/msgqueue.c +++ b/msgqueue.c @@ -123,10 +123,16 @@ semSetValue(int semid, int semnum, int value) int initSem(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); @@ -157,7 +163,7 @@ initSem(int provs) semctl(sfcbSem, PROV_INUSE(i), SETVAL, sun); semctl(sfcbSem, PROV_ALIVE(i), SETVAL, sun); } - return 0; + _SFCB_RETURN(0); } int hooks/post-receive -- SFCB - Small Footprint CIM Broker |