Menu
▾
▴
[Sblim-commit] Git: SFCB - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-382-g4edfa29
|
From: Chris B. <buc...@us...> - 2013-01-29 20:16:23
|
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 4edfa29431dda8c56f0b46abe47b7f97ea685b02 (commit)
via 0906566a1b00eee375dc516c8c0a74454c92b063 (commit)
via 827757a489447d8906d172073e31e321c39c8936 (commit)
via cb7647c132fd27942d9a3679bc861aa99f43ab1d (commit)
from 1c16a44018434d1959638ce0df13000ee3fa82f1 (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 4edfa29431dda8c56f0b46abe47b7f97ea685b02
Author: buccella <buc...@li...>
Date: Tue Jan 29 15:16:05 2013 -0500
[ 2990304 ] Enhancements for sfcb
commit 0906566a1b00eee375dc516c8c0a74454c92b063
Merge: 827757a 1c16a44
Author: buccella <buc...@li...>
Date: Tue Jan 29 15:15:19 2013 -0500
Merge branch 'master' of ssh://sblim.git.sourceforge.net/gitroot/sblim/sfcb
commit 827757a489447d8906d172073e31e321c39c8936
Author: buccella <buc...@li...>
Date: Tue Jan 29 15:15:03 2013 -0500
[ 2990304 ] Enhancements for sfcb
commit cb7647c132fd27942d9a3679bc861aa99f43ab1d
Author: buccella <buc...@li...>
Date: Tue Jan 29 12:53:51 2013 -0500
[ [ 2778345 ] There is no response at GetClass after CreateClass
-----------------------------------------------------------------------
Summary of changes:
diff --git a/NEWS b/NEWS
index b020612..8bfe833 100644
--- a/NEWS
+++ b/NEWS
@@ -21,6 +21,8 @@ Bugs fixed:
- 3601301 Add stubs for empty CMPI functions for internal providers
- 2878328 sfcb and mofc won't compile with --disable-qualifierrep
- 3601661 Reenable no-fork http adapter mode
+- 2990304 Enhancements for sfcb
+- 2778345 There is no response at GetClass after CreateClass
Changes in 1.4.3
================
diff --git a/contributions.txt b/contributions.txt
index 32b5092..6226e22 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -149,6 +149,7 @@ Shigeyoshi Hashi, NEC
06/06/2009 [ 2780152 ] SetProperty without NewValue gets segfault
09/22/2009 [ 2793653 ] CreateInstance method of abstract class
11/09/2009 [ 2727811 ] typeo in fileRepository.c
+01/29/2013 [ 2778345 ] There is no response at GetClass after CreateClass
Chad Smith, HP
--------------
@@ -212,3 +213,7 @@ Zane Bitter, Red Hat
PitRunner
---------
06/12/2012 [ 3533179 ] Double definition for union semun in FreeBSD
+
+Bas ten Berge
+-------------
+01/29/2013 [ 2990304 ] Enhancements for sfcb
diff --git a/httpAdapter.c b/httpAdapter.c
index b74998f..f24d0ef 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -2255,7 +2255,7 @@ ccValidate(X509 * certificate, char **principal, int mode)
Validate validate;
_SFCB_ENTER(TRACE_HTTPDAEMON, "ccValidate");
- if (getControlChars("certificateAuthlib", &ln) == 0) {
+ if (getControlChars("certificateAuthLib", &ln) == 0) {
libraryName(NULL, ln, dlName, 512);
if ((authLib = dlopen(dlName, RTLD_LAZY))) {
validate = dlsym(authLib, "_sfcCertificateAuthenticate");
diff --git a/mlog.c b/mlog.c
index fdebf78..ee614fb 100644
--- a/mlog.c
+++ b/mlog.c
@@ -185,6 +185,9 @@ mlogf(int priority, int errout, const char *fmt, ...)
case M_INFO:
priosysl = LOG_INFO;
break;
+ case M_NOTICE:
+ priosysl=LOG_NOTICE;
+ break;
case M_ERROR:
default:
priosysl = LOG_ERR;
diff --git a/mlog.h b/mlog.h
index 15bce24..97edc4f 100644
--- a/mlog.h
+++ b/mlog.h
@@ -23,6 +23,7 @@
#define M_DEBUG 1
#define M_INFO 2
#define M_ERROR 3
+#define M_NOTICE 4
#define M_SHOW 1
#define M_QUIET 0
diff --git a/objectImpl.c b/objectImpl.c
index 0da6d0d..5125fd5 100644
--- a/objectImpl.c
+++ b/objectImpl.c
@@ -1627,6 +1627,32 @@ addObjectPropertyH(ClObjectHdr * hdr, ClSection * prps,
(char *) addClString(hdr, d.value.chars);
}
}
+ /* added from 2778345 */
+ else if (od.type == CMPI_string && (d.state & CMPI_nullValue) == 0) {
+ char *pClString = NULL;
+ if ((p + i - 1)->quals && ClProperty_Q_EmbeddedObject)
+ _SFCB_RETURN(-CMPI_RC_ERR_TYPE_MISMATCH);
+
+ switch (d.type) {
+ case CMPI_chars:
+ pClString = d.value.chars;
+ break;
+ case CMPI_string:
+ pClString = d.value.string->hdl;
+ break;
+ default:
+ _SFCB_RETURN(-CMPI_RC_ERR_TYPE_MISMATCH);
+ }
+ if (pClString) {
+ if (od.value.string) {
+ _SFCB_RETURN(-CMPI_RC_ERR_TYPE_MISMATCH);
+ }
+ (p + i - 1)->data = d;
+ (p + i - 1)->data.value.chars =
+ (char *) addClString(hdr, pClString);
+ (p + i - 1)->data.type=CMPI_chars;
+ }
+ }
else if (od.type == CMPI_dateTime && (d.state & CMPI_nullValue) == 0) {
char chars[26];
diff --git a/providerRegister.c b/providerRegister.c
index d0e9ce1..1d3c775 100644
--- a/providerRegister.c
+++ b/providerRegister.c
@@ -245,7 +245,7 @@ newProviderRegister()
// Set the default provider uid
info->uid = provuid;
if (!provSFCB)
- info->user = strdup(provuser);
+ info->user = provuser ? strdup(provuser) : NULL;
break;
case 2:
if (strcmp(rv.id, "provider") == 0)
diff --git a/sfcBroker.c b/sfcBroker.c
index 1ce112f..700d0c3 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -255,6 +255,9 @@ stopBroker()
if (providersStopped)
break;
}
+
+ mlogf(M_NOTICE,M_QUIET,"--- %s V" sfcHttpDaemonVersion " stopped - %d\n", name, currentProc);
+
remSem();
uninit_sfcBroker();
@@ -607,7 +610,7 @@ main(int argc, char *argv[])
doBa = 0,
enableInterOp = 0,
httpLocalOnly = 0;
- int syslogLevel = LOG_ERR;
+ int syslogLevel = LOG_NOTICE;
long dSockets,
pSockets;
char *pauseStr;
@@ -744,7 +747,7 @@ main(int argc, char *argv[])
startLogging(syslogLevel,1);
- mlogf(M_INFO, M_SHOW, "--- %s V" sfcHttpDaemonVersion " started - %d\n",
+ mlogf(M_NOTICE, M_SHOW, "--- %s V" sfcHttpDaemonVersion " started - %d\n",
name, currentProc);
//get the creation timestamp for the sequence context
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
