Menu
▾
▴
sblim-commit — CVS Commit Info for SBLIM
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
(1) |
Mar
(45) |
Apr
(150) |
May
(145) |
Jun
(150) |
Jul
(79) |
Aug
(313) |
Sep
(160) |
Oct
(309) |
Nov
(115) |
Dec
(60) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(160) |
Feb
(144) |
Mar
(127) |
Apr
(48) |
May
(102) |
Jun
(54) |
Jul
(245) |
Aug
(94) |
Sep
(152) |
Oct
(162) |
Nov
(166) |
Dec
(740) |
| 2007 |
Jan
(752) |
Feb
(437) |
Mar
(328) |
Apr
(373) |
May
(569) |
Jun
(399) |
Jul
(369) |
Aug
(627) |
Sep
(100) |
Oct
(306) |
Nov
(166) |
Dec
(282) |
| 2008 |
Jan
(68) |
Feb
(145) |
Mar
(180) |
Apr
(160) |
May
(277) |
Jun
(229) |
Jul
(1188) |
Aug
(51) |
Sep
(97) |
Oct
(99) |
Nov
(95) |
Dec
(170) |
| 2009 |
Jan
(39) |
Feb
(73) |
Mar
(120) |
Apr
(121) |
May
(104) |
Jun
(262) |
Jul
(57) |
Aug
(171) |
Sep
(131) |
Oct
(88) |
Nov
(64) |
Dec
(83) |
| 2010 |
Jan
(55) |
Feb
(67) |
Mar
(124) |
Apr
(64) |
May
(130) |
Jun
(75) |
Jul
(164) |
Aug
(64) |
Sep
(44) |
Oct
(17) |
Nov
(43) |
Dec
(31) |
| 2011 |
Jan
(21) |
Feb
(10) |
Mar
(43) |
Apr
(46) |
May
(52) |
Jun
(71) |
Jul
(7) |
Aug
(16) |
Sep
(51) |
Oct
(14) |
Nov
(33) |
Dec
(15) |
| 2012 |
Jan
(12) |
Feb
(61) |
Mar
(129) |
Apr
(76) |
May
(70) |
Jun
(52) |
Jul
(29) |
Aug
(41) |
Sep
(32) |
Oct
(23) |
Nov
(38) |
Dec
(26) |
| 2013 |
Jan
(35) |
Feb
(37) |
Mar
(51) |
Apr
(15) |
May
(52) |
Jun
(15) |
Jul
(23) |
Aug
(21) |
Sep
(46) |
Oct
(69) |
Nov
(57) |
Dec
(26) |
| 2014 |
Jan
(5) |
Feb
(13) |
Mar
(17) |
Apr
(1) |
May
(5) |
Jun
|
Jul
(2) |
Aug
(2) |
Sep
(1) |
Oct
(16) |
Nov
(8) |
Dec
(4) |
| 2015 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(1) |
Jun
(4) |
Jul
|
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
|
From: Dave B. <bla...@us...> - 2011-03-15 10:00:40
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv5662 Modified Files: ChangeLog sblim-cim-client2.spec NEWS Log Message: 2.1.8 release work Index: sblim-cim-client2.spec =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.spec,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- sblim-cim-client2.spec 15 Dec 2010 10:57:15 -0000 1.20 +++ sblim-cim-client2.spec 15 Mar 2011 10:00:38 -0000 1.21 @@ -158,6 +158,22 @@ # ----------------------------------------------------------------------------- %changelog +* Tue Mar 15 2011 Dave Blaschke <bla...@us...> +- New release 2.1.8 + o 3197423 Server authentication with PegasusLocalAuthInfo failing + o 3197627 testBasicConnect unit test fails on Windows + o 3194700 Exception thrown on extrinsic methods + o 3194680 Error in numeric keys + o 3195069 Need support to disable SSL Handshake + o 3185763 Reliable indication support - Phase 1 + o 3190335 Erroneous use of SystemName property in samples + o 3186176 XML response for indication not traced + o 3185833 missing newline when logging request/response + o 3185824 Char16 definition includes whitespace + o 3185818 indicationOccured URL incorrect + o 3182121 Add Jsr48PegasusIndicationSample + o 3154232 EmbeddedObject misspelled in javadoc + * Wed Dec 15 2010 Dave Blaschke <bla...@us...> - New release 2.1.7 o 3111718 org.sblim.cimclient SSL Code is using the wrong SSL Property Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.215 retrieving revision 1.216 diff -u -d -r1.215 -r1.216 --- NEWS 14 Mar 2011 13:39:59 -0000 1.215 +++ NEWS 15 Mar 2011 10:00:38 -0000 1.216 @@ -1,4 +1,4 @@ -Changes in HEAD +Version 2.1.8 ================ 3197423 Server authentication with PegasusLocalAuthInfo failing 3197627 testBasicConnect unit test fails on Windows Index: ChangeLog =================================================================== RCS file: /cvsroot/sblim/jsr48-client/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- ChangeLog 15 Dec 2010 10:57:15 -0000 1.19 +++ ChangeLog 15 Mar 2011 10:00:38 -0000 1.20 @@ -1,3 +1,115 @@ +Release 2.1.8 +============= + +Mon Mar 14 08:39:58 CDT 2011 blaschke-oss + + 3197423 Server authentication with PegasusLocalAuthInfo failing + + WBEMClientCIMXML.java 1.63 + WBEMConfigurationProperties.java 1.35 + sblim-cim-client2.properties 1.19 + NEWS 1.215 + +Mon Mar 14 08:25:15 CDT 2011 blaschke-oss + + 3197627 testBasicConnect unit test fails on Windows + + SSLConfigurationTest.java 1.7 + NEWS 1.214 + +Mon Mar 14 08:17:38 CDT 2011 blaschke-oss + + 3194700 Exception thrown on extrinsic methods + + ReturnValueNode.java 1.11 + NEWS 1.213 + +Mon Mar 14 08:12:22 CDT 2011 blaschke-oss + + 3194680 Error in numeric keys + + Test.java 1.12 + IntegerValue.java 1.12 + NEWS 1.212 + +Mon Mar 14 07:52:51 CDT 2011 blaschke-oss + + 3195069 Need support to disable SSL Handshake + + WBEMConfigurationDefaults.java 1.25 + WBEMConfiguration.java 1.35 + HttpClient.java 1.34 + WBEMConfigurationProperties.java 1.34 + sblim-cim-client2.properties 1.18 + NEWS 1.211 + +Fri Mar 11 07:46:42 CST 2011 blaschke-oss + + 3185763 Reliable indication support - Phase 1 + + CIMIndicationHandler.java 1.19 + WBEMConfigurationDefaults.java 1.24 + WBEMConfiguration.java 1.34 + WBEMConfigurationProperties.java 1.33 + sblim-cim-client2.properties 1.17 + NEWS 1.210 + +Fri Mar 11 07:08:17 CST 2011 blaschke-oss + + 3190335 Erroneous use of SystemName property in samples + + Jsr48OperationSample.java 1.11 + Jsr48IndicationSample.java 1.11 + NEWS 1.209 + +Mon Mar 07 08:27:45 CST 2011 blaschke-oss + + 3186176 XML response for indication not traced + + CIMIndicationHandler.java 1.18 + NEWS 1.208 + +Mon Mar 07 08:20:04 CST 2011 blaschke-oss + + 3185833 missing newline when logging request/response + + WBEMClientCIMXML.java 1.62 + DebugInputStream.java 1.8 + NEWS 1.207 + +Mon Mar 07 08:12:03 CST 2011 blaschke-oss + + 3185824 Char16 definition includes whitespace + + MOF.java 1.20 + NEWS 1.206 + +Mon Mar 07 08:00:41 CST 2011 blaschke-oss + + 3185818 indicationOccured URL incorrect + + CIMIndicationHandler.java 1.17 + HttpContentHandler.java 1.6 + HttpConnectionHandler.java 1.9 + Jsr48PegasusIndicationSample.java 1.3 + NEWS 1.205 + +Mon Mar 07 07:39:30 CST 2011 blaschke-oss + + 3182121 Add Jsr48PegasusIndicationSample + + Jsr48PegasusIndicationSample.java 1.2 + NEWS 1.204 + +Tue Feb 15 06:42:35 CST 2011 blaschke-oss + + 3154232 EmbeddedObject misspelled in javadoc + + version.txt 1.3 + LogAndTraceBroker.java 1.20 + CIMQualifiedElementInterfaceImpl.java 1.18 + build.xml 1.43 + Release 2.1.7 ============= |
|
From: Dave B. <bla...@us...> - 2011-03-14 14:04:23
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient In directory vz-cvs-3.sog:/tmp/cvs-serv19561/src/org/sblim/cimclient Modified Files: WBEMConfigurationProperties.java Log Message: 3195069 - Need support to disable SSL Handshake Index: WBEMConfigurationProperties.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMConfigurationProperties.java,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- WBEMConfigurationProperties.java 14 Mar 2011 13:39:59 -0000 1.35 +++ WBEMConfigurationProperties.java 14 Mar 2011 14:04:20 -0000 1.36 @@ -557,7 +557,7 @@ * If set to false, SSL handshakes are not synchronized. If set to true, SSL handshakes * are synchronized as a workaround for an IBMJSSE1 problem with thread-safe handshakes. * - * Note: This property has no affect unless sblim.wbem.performSslHandshake is set to + * Note: This property has no affect unless sblim.wbem.performSslHandshake is set to * true. * * Type: Boolean |
|
From: Dave B. <bla...@us...> - 2011-03-14 13:40:01
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory vz-cvs-3.sog:/tmp/cvs-serv11501/src/org/sblim/cimclient/internal/wbem
Modified Files:
WBEMClientCIMXML.java
Log Message:
3197423 - Server authentication with PegasusLocalAuthInfo failing
Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- WBEMClientCIMXML.java 7 Mar 2011 14:20:04 -0000 1.62
+++ WBEMClientCIMXML.java 14 Mar 2011 13:39:58 -0000 1.63
@@ -53,6 +53,7 @@
* 3019252 2010-06-21 blaschke-oss Methods concatenate strings using + in a loop
* 3028518 2010-07-14 blaschke-oss Additional StringBuilder use
* 3185833 2011-02-18 blaschke-oss missing newline when logging request/response
+ * 3197423 2011-03-02 blaschke-oss Server authentication with PegasusLocalAuthInfo failing
*/
package org.sblim.cimclient.internal.wbem;
@@ -200,32 +201,21 @@
boolean defaultAuthEnabled = WBEMConfiguration.getGlobalConfiguration()
.isDefaultAuthorizationEnabled();
- String user = "";
- String password = "";
- if (credential == null
- || principal == null
- || principal.getName() == null
- || (credential instanceof PasswordCredential && (((PasswordCredential) credential)
- .getUserPassword() == null || ((PasswordCredential) credential)
- .getUserPassword().length == 0))
- || (credential instanceof RoleCredential && (((RoleCredential) credential)
- .getCredential() == null || ((RoleCredential) credential)
- .getCredential().length == 0))) {
- if (defaultAuthEnabled) {
- logger.trace(Level.FINER,
- "Empty credential or principal - Default IS enabled !");
- user = WBEMConfiguration.getGlobalConfiguration().getDefaultPrincipal();
- password = WBEMConfiguration.getGlobalConfiguration().getDefaultCredentials();
- } else {
- logger.trace(Level.FINER,
- "Empty credential or principal - Default NOT enabled !");
- }
- } else {
- user = principal.getName();
- password = (credential instanceof PasswordCredential) ? new String(
- ((PasswordCredential) credential).getUserPassword()) : new String(
- ((RoleCredential) credential).getCredential());
+ String user = (principal != null) ? principal.getName() : "";
+ String password = (credential != null && credential instanceof PasswordCredential) ? new String(
+ ((PasswordCredential) credential).getUserPassword())
+ : ((credential != null && credential instanceof RoleCredential) ? new String(
+ ((RoleCredential) credential).getCredential()) : "");
+
+ if (defaultAuthEnabled && (user == null || user.length() == 0)
+ && password.length() == 0) {
+ logger.trace(Level.FINER,
+ "Principal and Credential not set - using default authorization!");
+
+ user = WBEMConfiguration.getGlobalConfiguration().getDefaultPrincipal();
+ password = WBEMConfiguration.getGlobalConfiguration().getDefaultCredentials();
}
+
authInfo.setCredentials(new PasswordAuthentication(user, password.toCharArray()));
this.iAuthorizationHandler = new AuthorizationHandler();
this.iAuthorizationHandler.addAuthorizationInfo(authInfo);
|
|
From: Dave B. <bla...@us...> - 2011-03-14 13:25:17
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv7292 Modified Files: NEWS Log Message: 3197627 - testBasicConnect unit test fails on Windows Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.213 retrieving revision 1.214 diff -u -d -r1.213 -r1.214 --- NEWS 14 Mar 2011 13:17:38 -0000 1.213 +++ NEWS 14 Mar 2011 13:25:15 -0000 1.214 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3197627 testBasicConnect unit test fails on Windows 3194700 Exception thrown on extrinsic methods 3194680 Error in numeric keys 3195069 Need support to disable SSL Handshake |
|
From: Dave B. <bla...@us...> - 2011-03-14 13:17:40
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv5197 Modified Files: NEWS Log Message: 3194700 - Exception thrown on extrinsic methods Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.212 retrieving revision 1.213 diff -u -d -r1.212 -r1.213 --- NEWS 14 Mar 2011 13:12:23 -0000 1.212 +++ NEWS 14 Mar 2011 13:17:38 -0000 1.213 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3194700 Exception thrown on extrinsic methods 3194680 Error in numeric keys 3195069 Need support to disable SSL Handshake 3185763 Reliable indication support - Phase 1 |
|
From: Dave B. <bla...@us...> - 2011-03-14 13:12:25
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv3440 Modified Files: NEWS Log Message: 3194680 - Error in numeric keys Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.211 retrieving revision 1.212 diff -u -d -r1.211 -r1.212 --- NEWS 14 Mar 2011 12:52:52 -0000 1.211 +++ NEWS 14 Mar 2011 13:12:23 -0000 1.212 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3194680 Error in numeric keys 3195069 Need support to disable SSL Handshake 3185763 Reliable indication support - Phase 1 3190335 Erroneous use of SystemName property in samples |
|
From: Dave B. <bla...@us...> - 2011-03-14 12:52:54
|
Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient In directory vz-cvs-3.sog:/tmp/cvs-serv27940/src/org/sblim/cimclient Modified Files: WBEMConfigurationProperties.java Log Message: 3195069 - Need support to disable SSL Handshake Index: WBEMConfigurationProperties.java =================================================================== RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/WBEMConfigurationProperties.java,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- WBEMConfigurationProperties.java 11 Mar 2011 13:46:42 -0000 1.33 +++ WBEMConfigurationProperties.java 14 Mar 2011 12:52:52 -0000 1.34 @@ -28,6 +28,7 @@ * 3046073 2010-09-07 blaschke-oss Performance hit due to socket conn. creation with timeout * 3111718 2010-11-18 blaschke-oss org.sblim.cimclient SSL Code is using the wrong SSL Property * 3185763 2011-02-25 blaschke-oss Reliable indication support - Phase 1 + * 3195069 2011-02-28 blaschke-oss Need support to disable SSL Handshake */ package org.sblim.cimclient; @@ -539,11 +540,27 @@ /** * <pre> + * If set to true, SSL handshakes are performed after an SSL socket is created by the + * socket factory. If set to false, handshakes are not performed, which is useful if + * if the handshake has already taken place. + * + * Type: Boolean + * Recognition: Anytime + * Default: true + * </pre> + */ + public static final String PERFORM_SSL_HANDSHAKE = "sblim.wbem.performSslHandshake"; + + /** + * <pre> * If set to false, SSL handshakes are not synchronized. If set to true, SSL handshakes * are synchronized as a workaround for an IBMJSSE1 problem with thread-safe handshakes. * + * Note: This property has no affect unless sblim.wbem.performSslHandshake is set to + * true. + * * Type: Boolean - * Recognition: On next HTTP client + * Recognition: Anytime * Default: false * </pre> */ @@ -558,7 +575,7 @@ * process in Java 5+ (see Sun bug 5092063). * * Type: Boolean - * Recognition: On next HTTP client + * Recognition: Anytime * Default: true * </pre> */ |
|
From: Dave B. <bla...@us...> - 2011-03-11 13:46:44
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv30682 Modified Files: NEWS sblim-cim-client2.properties Log Message: 3185763 - Reliable indication support - Phase 1 Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.209 retrieving revision 1.210 diff -u -d -r1.209 -r1.210 --- NEWS 11 Mar 2011 13:08:17 -0000 1.209 +++ NEWS 11 Mar 2011 13:46:42 -0000 1.210 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3185763 Reliable indication support - Phase 1 3190335 Erroneous use of SystemName property in samples 3186176 XML response for indication not traced 3185833 missing newline when logging request/response Index: sblim-cim-client2.properties =================================================================== RCS file: /cvsroot/sblim/jsr48-client/sblim-cim-client2.properties,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- sblim-cim-client2.properties 6 Dec 2010 19:43:02 -0000 1.16 +++ sblim-cim-client2.properties 11 Mar 2011 13:46:42 -0000 1.17 @@ -503,3 +503,43 @@ # Default: 30000 # #sblim.wbem.listenerHandlerMaxIdle=30000 + +# If set to true, reliable indication support is enabled and indications +# are processed accordingly. If set to false, reliable indication +# support is disabled and indications are passed directly to listener. +# +# Type: Boolean +# Recognition: On next creation of a WBEMListener +# Default: false +# +#sblim.wbem.listenerEnableReliableIndications=false + +# The default value to use for CIM_IndicationService DeliveryRetryAttempts +# property until it is received in an indication. See DSP1054 for details +# on reliable indications. +# +# Note: This property has no effect unless reliable indication support is +# enabled. See the sblim.wbem.listenerEnableReliableIndications property. +# +# Type: Long +# Unit: Count +# Recognition: On next creation of a WBEMListener +# Range: 0 .. Long.MAX_VALUE +# Default: 3 +# +#sblim.wbem.listenerDeliveryRetryAttempts=3 + +# The default value to use for CIM_IndicationService DeliveryRetryInterval +# property until it is received in an indication. See DSP1054 for details +# on reliable indications. +# +# Note: This property has no effect unless reliable indication support is +# enabled. See the sblim.wbem.listenerEnableReliableIndications property. +# +# Type: Long +# Unit: Seconds +# Recognition: On next creation of a WBEMListener +# Range: 0 .. Long.MAX_VALUE +# Default: 20 +# +#sblim.wbem.listenerDeliveryRetryInterval=20 |
|
From: Dave B. <bla...@us...> - 2011-03-11 13:08:20
|
Update of /cvsroot/sblim/jsr48-client In directory vz-cvs-3.sog:/tmp/cvs-serv17651 Modified Files: NEWS Log Message: 3190335 - Erroneous use of SystemName property in samples Index: NEWS =================================================================== RCS file: /cvsroot/sblim/jsr48-client/NEWS,v retrieving revision 1.208 retrieving revision 1.209 diff -u -d -r1.208 -r1.209 --- NEWS 7 Mar 2011 14:27:45 -0000 1.208 +++ NEWS 11 Mar 2011 13:08:17 -0000 1.209 @@ -1,5 +1,6 @@ Changes in HEAD ================ +3190335 Erroneous use of SystemName property in samples 3186176 XML response for indication not traced 3185833 missing newline when logging request/response 3185824 Char16 definition includes whitespace |
|
From: Chris B. <buc...@us...> - 2011-03-09 21:44:34
|
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 80e6bc17830f7e2fcc66c58beb062ce0ebdad719 (commit)
from b61b5c4cf71b8c15b6432f3ae2d9355067bffd10 (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 80e6bc17830f7e2fcc66c58beb062ce0ebdad719
Author: buccella <buc...@li...>
Date: Wed Mar 9 16:44:16 2011 -0500
[ 3202420 ] CDATA value in a string property is improperly XML escaped
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 10fb807..3f66017 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-09 Chris Buccella <buc...@li...>
+
+ * cimXmlGen.c:
+ [ 3202420 ] CDATA value in a string property is improperly XML escaped
+ (patch by Chris Poblete)
+
2011-03-08 Chris Buccella <buc...@li...>
* httpAdapter.c, sfcBasicPAMAuthentication.c:
diff --git a/NEWS b/NEWS
index c980efa..36779d2 100644
--- a/NEWS
+++ b/NEWS
@@ -65,6 +65,7 @@ Bugs fixed:
- 3185178 Wrong classname for returned instances from execQuery
- 3175770 execQuery returns multiple instances of same object
- 3203290 Basic Auth Should Consider Expired Passwords
+- 3202420 CDATA value in a string property is improperly XML escaped
Changes in 1.3.10
=================
diff --git a/cimXmlGen.c b/cimXmlGen.c
index c3cf118..16deb25 100644
--- a/cimXmlGen.c
+++ b/cimXmlGen.c
@@ -66,7 +66,7 @@ XMLEscape(char *in, int *outlen)
l,
o,
n;
- char *out;
+ char *out, *end;
char *rep;
_SFCB_ENTER(TRACE_CIMXMLPROC, "XMLEscape");
@@ -85,6 +85,19 @@ XMLEscape(char *in, int *outlen)
rep = ">";
break;
case '<':
+
+ /* skip escaping if this is a CDATA section */
+ if ((in[i+1] == '!') && ((l-i) > 11)) { /* do minimum check, then check if enough chars to compare */
+ rep = &in[i];
+ if (!strncmp(rep, "<![CDATA[", 9)) { /* now look for the cdata start marker */
+ if ((end = strstr(rep, "]]>"))) { /* valid cdata should have end marker */
+ n = ((end-rep)+3);
+ i += (n - 1);
+ break;
+ } /* else, bad format */
+ }
+ }
+
n = 4;
rep = "<";
break;
diff --git a/contributions.txt b/contributions.txt
index 595e8c6..7ac411a 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -181,6 +181,7 @@ Chris Poblete, Dell
11/08/2010 [ 3101155 ] Failed to load provider libraries due to symbol conflicts
11/09/2010 [ 3101148 ] SfcbLocal method parameter type conversion and validation
11/10/2010 [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission
+03/09/2010 [ 3202420 ] CDATA value in a string property is improperly XML escaped
Josef Moellers
--------------
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2011-03-09 00:40:22
|
Update of /cvsroot/sblim/sfcb
In directory vz-cvs-3.sog:/tmp/cvs-serv21823
Modified Files:
cimXmlGen.c ChangeLog NEWS contributions.txt
Log Message:
[ 3202420 ] CDATA value in a string property is improperly XML escaped
Index: cimXmlGen.c
===================================================================
RCS file: /cvsroot/sblim/sfcb/cimXmlGen.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- cimXmlGen.c 10 Apr 2010 02:18:19 -0000 1.72
+++ cimXmlGen.c 9 Mar 2011 00:40:20 -0000 1.73
@@ -64,7 +64,7 @@
{
int i, l, o, n;
char *out;
- char *rep;
+ char *rep, *end;
_SFCB_ENTER(TRACE_CIMXMLPROC, "XMLEscape");
@@ -82,6 +82,19 @@
rep = ">";
break;
case '<':
+
+ /* skip escaping if this is a CDATA section */
+ if ((in[i+1] == '!') && ((l-i) > 11)) { /* do minimum check, then check if enough chars to compare */
+ rep = &in[i];
+ if (!strncmp(rep, "<![CDATA[", 9)) { /* now look for the cdata start marker */
+ if ((end = strstr(rep, "]]>"))) { /* valid cdata should have end marker */
+ n = ((end-rep)+3);
+ i += (n - 1);
+ break;
+ } /* else, bad format */
+ }
+ }
+
n = 4;
rep = "<";
break;
Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/sfcb/NEWS,v
retrieving revision 1.573
retrieving revision 1.574
diff -u -d -r1.573 -r1.574
--- NEWS 8 Mar 2011 20:47:11 -0000 1.573
+++ NEWS 9 Mar 2011 00:40:20 -0000 1.574
@@ -10,6 +10,7 @@
- 3185178 Wrong classname for returned instances from execQuery
- 3175770 execQuery returns multiple instances of same object
- 3203290 Basic Auth Should Consider Expired Passwords
+- 3202420 CDATA value in a string property is improperly XML escaped
Changes in 1.3.10
=================
Index: contributions.txt
===================================================================
RCS file: /cvsroot/sblim/sfcb/contributions.txt,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- contributions.txt 17 Nov 2010 16:18:51 -0000 1.60
+++ contributions.txt 9 Mar 2011 00:40:20 -0000 1.61
@@ -178,6 +178,7 @@
11/08/2010 [ 3101155 ] Failed to load provider libraries due to symbol conflicts
11/08/2010 [ 3101148 ] SfcbLocal method parameter type conversion and validation
11/10/2010 [ 3101154 ] Daemon clients failed SfcbLocal connect due to permission
+03/08/2011 [ 3202420 ] CDATA value in a string property is improperly XML escaped
Josef Moellers
--------------
Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/sfcb/ChangeLog,v
retrieving revision 1.646
retrieving revision 1.647
diff -u -d -r1.646 -r1.647
--- ChangeLog 8 Mar 2011 20:47:11 -0000 1.646
+++ ChangeLog 9 Mar 2011 00:40:20 -0000 1.647
@@ -1,5 +1,9 @@
2011-03-08 Chris Buccella <buc...@li...>
+ * cimXmlGen.c:
+ [ 3202420 ] CDATA value in a string property is improperly XML escaped
+ (patch by Chris Poblete)
+
* httpAdapter.c, sfcBasicPAMAuthentication.c:
[ 3203290 ] Basic Auth Should Consider Expired Passwords
|
|
From: Chris B. <buc...@us...> - 2011-03-08 21:21:35
|
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 b61b5c4cf71b8c15b6432f3ae2d9355067bffd10 (commit)
via 15e99848995b48593fca2081769f19ca39b4ad18 (commit)
from db253645551ff731abfef80bcc3d701d2c67e5d0 (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 b61b5c4cf71b8c15b6432f3ae2d9355067bffd10
Author: buccella <buc...@li...>
Date: Tue Mar 8 16:21:14 2011 -0500
[ 3203290 ] Basic Auth Should Consider Expired Passwords
commit 15e99848995b48593fca2081769f19ca39b4ad18
Author: buccella <buc...@li...>
Date: Tue Mar 8 16:18:08 2011 -0500
[ 3203290 ] Basic Auth Should Consider Expired Passwords
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 6a5a0cc..10fb807 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-08 Chris Buccella <buc...@li...>
+
+ * httpAdapter.c, sfcBasicPAMAuthentication.c:
+ [ 3203290 ] Basic Auth Should Consider Expired Passwords
+
2011-03-03 Michael Chase-Salerno <br...@li...>
* Makefile.am, configure.ac, README:
diff --git a/NEWS b/NEWS
index b1f15d6..c980efa 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,7 @@ Bugs fixed:
- 3172080 deliverIndication does not check for matching FROM classes
- 3185178 Wrong classname for returned instances from execQuery
- 3175770 execQuery returns multiple instances of same object
+- 3203290 Basic Auth Should Consider Expired Passwords
Changes in 1.3.10
=================
diff --git a/httpAdapter.c b/httpAdapter.c
index 7504b1b..072d126 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -113,6 +113,11 @@ static int get_cert(int, X509_STORE_CTX *);
static int ccValidate(X509 *, char **, int);
#endif
+/* return codes used by baValidate */
+#define AUTH_PASS 1
+#define AUTH_FAIL 0
+#define AUTH_EXPIRED -1
+
static key_t httpProcSemKey;
static key_t httpWorkSemKey;
static int httpProcSem;
@@ -232,49 +237,47 @@ baValidate(char *cred, char **principal)
{
char *auth,
*pw = NULL;
- int i,
- err = 0;
+ int i;
static void *authLib = NULL;
static Authenticate authenticate = NULL;
char dlName[512];
- int ret = 0;
+ int ret = AUTH_FAIL;
if (strncasecmp(cred, "basic ", 6))
- return 0;
+ return AUTH_FAIL;
auth = decode64(cred + 6);
- for (i = 0; i < strlen(auth); i++)
+ for (i = 0; i < strlen(auth); i++) {
if (auth[i] == ':') {
auth[i] = 0;
pw = &auth[i + 1];
break;
}
+ }
- if (err == 0 && authLib == NULL) {
+ if (authLib == NULL) {
char *ln;
- err = 1;
if (getControlChars("basicAuthlib", &ln) == 0) {
libraryName(NULL, ln, dlName, 512);
if ((authLib = dlopen(dlName, RTLD_LAZY))) {
authenticate = dlsym(authLib, "_sfcBasicAuthenticate");
- if (authenticate)
- err = 0;
}
}
- if (err)
+ if (authenticate == NULL) {
mlogf(M_ERROR, M_SHOW, "--- Authentication exit %s not found\n",
dlName);
+ ret = AUTH_FAIL;
+ }
}
- if (err) {
- ret = 1;
- } else {
+ if (authenticate) {
*principal = strdup(auth);
- if (authenticate(auth, pw))
- ret = 1;
+ ret = authenticate(auth, pw);
+ if (ret == AUTH_PASS) ret = AUTH_PASS;
+ else if (ret == AUTH_EXPIRED) ret = AUTH_EXPIRED;
+ else ret = AUTH_FAIL;
}
free(auth);
-
return ret;
}
diff --git a/sfcBasicPAMAuthentication.c b/sfcBasicPAMAuthentication.c
index 4f9c13e..6ca11eb 100644
--- a/sfcBasicPAMAuthentication.c
+++ b/sfcBasicPAMAuthentication.c
@@ -80,7 +80,11 @@ _sfcBasicAuthenticateRemote(char *user, char *pw, char *rhost)
if (rc == PAM_SUCCESS) {
retval = 1;
- } else {
+ }
+ else if (rc == PAM_NEW_AUTHTOK_REQD || rc == PAM_ACCT_EXPIRED) {
+ retval = -1;
+ }
+ else {
retval = 0;
}
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2011-03-08 16:50:34
|
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 "sfcCommon - Common lib for SFCB/SFCC".
The branch, master has been updated
via 0311c5d0fe31e230d2d4dd7f7e71aa22f1cc316f (commit)
from 31659c55d6f7bc81b38e711b17c8577d01140259 (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 0311c5d0fe31e230d2d4dd7f7e71aa22f1cc316f
Author: Michael Chase-Salerno <br...@li...>
Date: Tue Mar 8 11:48:47 2011 -0500
Removing excess newlines
-----------------------------------------------------------------------
Summary of changes:
diff --git a/sfcUtil/utilft.h b/sfcUtil/utilft.h
index d630a7c..54954d3 100644
--- a/sfcUtil/utilft.h
+++ b/sfcUtil/utilft.h
@@ -69,102 +69,25 @@ extern "C" {
(UtilHashTable * ht, int buckets);
HashTableIterator *(*getFirst)
- (UtilHashTable * ht, void **key, void **value);
- HashTableIterator *(*getNext)
-
+ (UtilHashTable * ht, void **key, void **value);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ HashTableIterator *(*getNext)
(UtilHashTable * ht, HashTableIterator * iterator, void **key,
void **value);
- void (*setKeyCmpFunction)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ void (*setKeyCmpFunction)
(UtilHashTable * ht,
int (*keycomp) (const void *k1, const void *k2));
- void (*setValueCmpFunction)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ void (*setValueCmpFunction)
(UtilHashTable * ht,
int (*keycomp) (const void *v1, const void *v2));
- void (*setHashFunction)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ void (*setHashFunction)
(UtilHashTable * ht,
unsigned long (*hashFunction) (const void *key));
- void (*setReleaseFunctions)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ void (*setReleaseFunctions)
(UtilHashTable * ht, void (*keyRelease) (void *key),
void (*valueRelease) (void *value));
};
hooks/post-receive
--
sfcCommon - Common lib for SFCB/SFCC
|
|
From: Michael Chase-S. <mc...@us...> - 2011-03-04 22:54:26
|
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, sfcCommon has been created
at a218bc0b90b47284e9d61a787e4883c652eed8d7 (commit)
- Log -----------------------------------------------------------------
commit a218bc0b90b47284e9d61a787e4883c652eed8d7
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Mar 4 17:45:39 2011 -0500
create sfcCommon - ID: 3177587
Changes for devel branch
commit 31e213b9e295f98b333865d9b3bf1d894b81a5c1
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Mar 4 17:28:04 2011 -0500
create sfcCommon - ID: 3177587
Changes for devel branch
-----------------------------------------------------------------------
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Michael Chase-S. <mc...@us...> - 2011-03-03 21:49:43
|
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 db253645551ff731abfef80bcc3d701d2c67e5d0 (commit)
from 701ee0f37771e6d40532b206dbee1e880e163952 (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 db253645551ff731abfef80bcc3d701d2c67e5d0
Author: Michael Chase-Salerno <br...@li...>
Date: Thu Mar 3 16:49:03 2011 -0500
create sfcCommon - ID: 3177587
Rollback changes to put in devel branch
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index a53b018..6a5a0cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-03 Michael Chase-Salerno <br...@li...>
+
+ * Makefile.am, configure.ac, README:
+ [ 3177587 ] create sfcCommon library
+ Rollback changes for a devel branch.
+
2011-02-28 Michael Chase-Salerno <br...@li...>
* Makefile.am, configure.ac, README, most .c files:
diff --git a/Makefile.am b/Makefile.am
index 2d1111b..c6f322d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,6 +27,7 @@ sfcbconfdir=$(sysconfdir)/sfcb
sfcbstatedir=$(localstatedir)/lib/sfcb
initdir=$(sysconfdir)/init.d
pamdir=$(sysconfdir)/pam.d
+sfcblibdir=$(libdir)/sfcb
cmpilibdir=$(libdir)/cmpi
MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
@@ -35,28 +36,6 @@ MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
BUILT_SOURCES=queryParser.c queryLexer.c sqlParser.c sqlLexer.c cimXmlOps.c cimXmlParserProcessed.c $(MANFILES)
-if SFCCOMMON
-# Use the local sfcCommon libs
- sfcblibdir=$(libdir)/sfcb
- SFCCOMMON_LIBS = libsfcUtil.la
- SFCCOMMON_CPPFLAGS="-I$(srcdir)/sfcUtil"
- SFCCOMMON_HEADER = sfcUtil/hashtable.h sfcUtil/utilft.h
-libsfcUtil_la_SOURCES = \
- sfcUtil/hashtable.c \
- sfcUtil/utilFactory.c \
- sfcUtil/utilHashtable.c \
- sfcUtil/utilStringBuffer.c \
- sfcUtil/libsfcUtil.Versions
-libsfcUtil_la_LDFLAGS = -Wl,--version-script,$(srcdir)/sfcUtil/libsfcUtil.Versions
-libsfcBrokerCore_la_LIBADD=-lsfcUtil
-libsfcBrokerCore_la_DEPENDENCIES=libsfcUtil.la
-else
-# Use shared library
- sfccommondir=$(includedir)/sfcCommon
- sfcblibdir=$(libdir)
-libsfcBrokerCore_la_LIBADD=
-endif
-
AM_YFLAGS=-d
AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
-DSFCB_STATEDIR=\"$(sfcbstatedir)\" \
@@ -64,7 +43,7 @@ AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
-DCMPI_LIBDIR=\"$(cmpilibdir)\" \
-DLIBDIR=\"$(libdir)\" \
-DSFCB_BINARY=\"$(sbindir)/sfcbd\" \
- $(SFCCOMMON_CPPFLAGS) \
+ -I$(srcdir)/sfcUtil \
@SFCB_CPPFLAGS@ \
@SFCB_CMPI_PLATFORM@
AM_LDFLAGS=@SFCB_LDFLAGS@
@@ -137,8 +116,8 @@ endif
sfcb_sharedobjects = \
$(sfcblibdir)/*.so
-
sfcblib_LTLIBRARIES = \
+ libsfcUtil.la \
libsfcBrokerCore.la \
libsfcFileRepository.la \
libsfcInternalProvider.la \
@@ -159,7 +138,6 @@ sfcblib_LTLIBRARIES = \
$(QUALREP_LIBS) \
$(INDICATION_LIBS) \
$(PAM_LIBS) \
- $(SFCCOMMON_LIBS) \
$(SLP_HOSTNAME_LIBS)
if TEST_ENABLED
@@ -183,6 +161,13 @@ bin_PROGRAMS = \
noinst_PROGRAMS = \
sfcbdumpP32onI32 classSchema2c
+libsfcUtil_la_SOURCES = \
+ sfcUtil/hashtable.c \
+ sfcUtil/utilFactory.c \
+ sfcUtil/utilHashtable.c \
+ sfcUtil/utilStringBuffer.c \
+ sfcUtil/libsfcUtil.Versions
+libsfcUtil_la_LDFLAGS = -Wl,--version-script,$(srcdir)/sfcUtil/libsfcUtil.Versions
libsfcBrokerCore_la_SOURCES = \
args.c \
@@ -222,6 +207,8 @@ libsfcBrokerCore_la_SOURCES = \
$(QUALREP_FILES)
libsfcBrokerCore_la_CFLAGS = $(AM_CFLAGS) @SFCB_CMPI_OS@
+libsfcBrokerCore_la_LIBADD=-lsfcUtil
+libsfcBrokerCore_la_DEPENDENCIES=libsfcUtil.la
queryLexer.c: $(srcdir)/queryLexer.l
$(LEX) -t $< | sed -e "s/yy/sfcQuery/g" > $@
@@ -329,7 +316,7 @@ libsfcClassProvider_la_DEPENDENCIES=libsfcBrokerCore.la
libsfcClassProviderMem_la_SOURCES = \
classProviderMem.c classSchemaMem.c interop_classSchema.c
-libsfcClassProviderMem_la_LIBADD=-lsfcBrokerCore -lsfcUtil
+libsfcClassProviderMem_la_LIBADD=-lsfcBrokerCore
libsfcClassProviderMem_la_DEPENDENCIES=libsfcBrokerCore.la
# Building providers in the test/TestProviders directory
@@ -418,14 +405,14 @@ sfcbinst2mof_SOURCES=sfcbinst2mof.c
sfcbinst2mof_LDADD = -lsfcFileRepository
classSchema2c_SOURCES=classSchema2c.c
-classSchema2c_LDADD=-lsfcBrokerCore -lsfcUtil
-classSchema2c_DEPENDENCIES=libsfcBrokerCore.la
+classSchema2c_LDADD=-lsfcBrokerCore
+classSchema2c_DEPENDENCIES=libsfcBrokerCore.la
noinst_HEADERS=array.h $(SLP_INC) httpComm.h control.h providerMgr.h \
constClass.h msgqueue.h providerRegister.h \
cimXmlParser.h native.h support.h cimXmlGen.h \
- cimRequest.h cimRsRequest.h objectImpl.h trace.h \
- mlog.h $(SFCCOMMON_HEADER) \
+ cimRequest.h cimRsRequest.h genericlist.h objectImpl.h trace.h \
+ sfcUtil/hashtable.h sfcUtil/utilft.h mlog.h \
cmpiftx.h cmpimacsx.h \
fileRepository.h internalProvider.h \
selectexp.h queryOperation.h \
diff --git a/NEWS b/NEWS
index f4a8412..b1f15d6 100644
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,6 @@ Changes in 1.4.1
New features:
- 3152523 Changes for footprinting in ABT
- 1596336 Add config option for network interface binding
-- 3177587 create sfcCommon library
Bugs fixed:
diff --git a/configure.ac b/configure.ac
index a4ab862..890a71a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,6 +31,10 @@ AC_CONFIG_SRCDIR([providerDrv.c])
AM_INIT_AUTOMAKE
AM_CONFIG_HEADER([config.h])
+#Source files will use the local sfcCommon files if this is set.
+#Reverse this to use the shared sfcCommon library.
+AC_DEFINE(SFCCOMMON,1,[Local sfcCommon files used.])
+
AC_ARG_ENABLE(debug,
[AC_HELP_STRING([--disable-debug],
[disable debug mode for SFCB.])],
@@ -107,13 +111,6 @@ AC_ARG_ENABLE(request-types,
[AC_HELP_STRING([--enable-request-types(=TYPES)],
[Enable support of listed request types. If none are listed, all are enabled.])])
-AC_ARG_ENABLE(sfcCommon,
- [AC_HELP_STRING([--disable-sfcCommon],
- [Disable local sfcCommon libraries and use shared version.])],
- [enable_sfcCommon=$enableval],
- [enable_sfcCommon="yes"]
- )
-
# Size checks
AC_CHECK_SIZEOF(void*)
AC_CHECK_SIZEOF(int)
@@ -233,7 +230,6 @@ AM_CONDITIONAL(CMDTEST,[test "$test_cmd" == "yes"])
AM_CONDITIONAL(SLPTEST,[test "$test_slp" == "yes"])
AM_CONDITIONAL(PROVTEST,[test "$test_providers" == "yes"])
AM_CONDITIONAL(PROVTEST,[test "$test_local" == "yes"])
-
if [test "$enable_tests"]; then
# The order of TEST_SUBDIRS determines test
# execution order.
@@ -336,12 +332,6 @@ if test "$handler_CIMRS" == "yes"; then
fi
# End of parser config
-if test "$enable_sfcCommon" == "yes"; then
- AC_DEFINE(SFCCOMMON,,[Local sfcCommon enabled])
-else
- AC_CHECK_LIB(sfcUtil,main,,[AC_MSG_ERROR([Could not find required sfcUtil])])
-fi
-
if test "$enable_uds" == "yes"; then
AC_DEFINE(HAVE_UDS,,[UDS authentication enabled])
fi
@@ -434,7 +424,6 @@ fi
# Checks for libraries.
AC_CHECK_LIB(pthread,main)
AC_CHECK_LIB(dl,main)
-
AC_CHECK_LIB(z,main,[SFCB_LIBZ=-lz],[AC_MSG_ERROR([Could not find required libz])])
if test "$enable_indications" = "yes" ; then
LOAD_INDICATION_PROVIDER=
@@ -546,7 +535,6 @@ AM_CONDITIONAL(DOCS,[test "$enable_docs" == "yes"])
AM_CONDITIONAL(IPV6,[test "$enable_ipv6" == "yes"])
AM_CONDITIONAL(LOCAL_CONNECT_NO_INDICATION,[test "$enable_local_connect_only" == "yes" -a "$enable_indications" == "no"])
AM_CONDITIONAL(LOCAL_CONNECT_ONLY,[test "$enable_local_connect_only" == "yes"])
-AM_CONDITIONAL(SFCCOMMON,[test "$enable_sfcCommon" == "yes"])
AC_CONFIG_FILES([Makefile sfcb.spec sfcbrepos.sh sfcbstage.sh sfcbunstage.sh
sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre
@@ -574,7 +562,6 @@ echo -e "uds"\\t\\t\\t\\t"${enable_uds:-no}"
echo -e "tests"\\t\\t\\t\\t"${enable_tests:-no}"
echo -e "debug"\\t\\t\\t\\t"${enable_debug:-no}"
echo -e "Request types"\\t\\t\\t"${enable_request_types}"
-echo -e "Local sfcCommon"\\t\\t\\t"${enable_sfcCommon}"
echo =================================================================
echo
echo "sfcb configuration complete. you may now run 'make'"
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Narasimha S. <nsh...@us...> - 2011-03-02 17:02:15
|
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 "SFCC - Small Footprint CIM Client".
The branch, master has been updated
via a53d9d182171b82cb21ae17a582e5faae2a91734 (commit)
from 6e09c884725e59c66e5b98bb602e94760ab4deb8 (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 a53d9d182171b82cb21ae17a582e5faae2a91734
Author: Narasimha Sharoff <nsh...@us...>
Date: Wed Mar 2 09:01:04 2011 -0800
[3195267] sfcc v2 tests segfault when sfcb is not running
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index b5e441b..b6d7772 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-02 Narasimha Sharoff <nsh...@us...>
+
+ * TEST/v2*.c
+ [ 3195267 ] sfcc v2 tests segfault when sfcb is not running
+
2011-03-01 Narasimha Sharoff <nsh...@us...>
* cimc/cimcclient.c
diff --git a/NEWS b/NEWS
index 68179e3..67133d3 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Bugs:
- 2348900: Concurrency issue when parsing responses
- 2793377: Missing includes
- 3101151: SfcbLocal failed to connect due to hardcoded library path
+- 3195267: sfcc v2 tests segfault when sfcb is not running
Changes in 2.2.1
================
diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c
index ba81477..1d66da0 100644
--- a/TEST/v2test_ec.c
+++ b/TEST/v2test_ec.c
@@ -65,6 +65,10 @@ int main()
}
client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
+ if (client == NULL) {
+ printf("Coudn't connect to the server. Check if sfcb is running.\n");
+ return 1;
+ }
op = ce->ft->newObjectPath(ce, "root/cimv2", NULL , &status);
diff --git a/TEST/v2test_ecn.c b/TEST/v2test_ecn.c
index 01629bf..35b1e65 100644
--- a/TEST/v2test_ecn.c
+++ b/TEST/v2test_ecn.c
@@ -69,6 +69,10 @@ int main()
return 1;
}
client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
+ if (client == NULL) {
+ printf("Coudn't connect to the server. Check if sfcb is running.\n");
+ return 1;
+ }
op = ce->ft->newObjectPath(ce, "root/cimv2", NULL , &status);
printf(" calling enumClassNames \n") ;
diff --git a/TEST/v2test_ei.c b/TEST/v2test_ei.c
index e887b55..f2fd4e2 100644
--- a/TEST/v2test_ei.c
+++ b/TEST/v2test_ei.c
@@ -63,9 +63,9 @@ int count = 0;
}
client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
- if(client == NULL)
- {
- printf(" failed the call to connect \n") ;
+ if (client == NULL) {
+ printf("Coudn't connect to the server. Check if sfcb is running.\n");
+ return 1;
}
op = (CMPIObjectPath *) ce->ft->newObjectPath(ce, "root/cimv2", "CIM_ManagedElement" , &status);
diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c
index 2aaf668..e2bc411 100644
--- a/TEST/v2test_ein.c
+++ b/TEST/v2test_ein.c
@@ -64,9 +64,9 @@ int count = 0;
}
printf("do connect \n") ;
client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
- if(client == NULL)
- {
- printf(" failed the call to connect \n") ;
+ if (client == NULL) {
+ printf("Coudn't connect to the server. Check if sfcb is running.\n");
+ return 1;
}
printf("do newObjectPath \n") ;
diff --git a/TEST/v2test_gc.c b/TEST/v2test_gc.c
index f6ee5e1..53fad69 100644
--- a/TEST/v2test_gc.c
+++ b/TEST/v2test_gc.c
@@ -93,6 +93,10 @@ int main()
if (rc == 0 ) {
client = ce->ft->connect(ce, cim_host , "http", cim_host_port, cim_host_userid, cim_host_passwd , &status);
+ if (client == NULL) {
+ printf("Coudn't connect to the server. Check if sfcb is running.\n");
+ return 1;
+ }
op = (CMPIObjectPath *)ce->ft->newObjectPath(ce, "root/cimv2", "CIM_ComputerSystem" , &status);
class =(CMPIConstClass *) client->ft->getClass(client,(CIMCObjectPath *) op, CMPI_FLAG_IncludeQualifiers, NULL, &status);
hooks/post-receive
--
SFCC - Small Footprint CIM Client
|
|
From: Narasimha S. <nsh...@us...> - 2011-03-01 18:07:07
|
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 "SFCC - Small Footprint CIM Client".
The branch, master has been updated
via 6e09c884725e59c66e5b98bb602e94760ab4deb8 (commit)
from 627f38949536e3acb43063d9f8e321811e0683e2 (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 6e09c884725e59c66e5b98bb602e94760ab4deb8
Author: Narasimha Sharoff <nsh...@us...>
Date: Tue Mar 1 10:05:16 2011 -0800
[3101151] SfcbLocal failed to connect due to hardcoded library path
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index a2d477b..b5e441b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-01 Narasimha Sharoff <nsh...@us...>
+
+ * cimc/cimcclient.c
+ [ 3101151 ] SfcbLocal failed to connect due to hardcoded library path
+
2011-02-22 Narasimha Sharoff <nsh...@us...>
* cimc/cimcclient.c, TEST/show.c, TEST/test.c, TEST/test_gc.c
diff --git a/NEWS b/NEWS
index 6a6d221..68179e3 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ Bugs:
- 3059060: 'struct _CIMCArgsFT' not defined in cimc/cimcft.h
- 2348900: Concurrency issue when parsing responses
- 2793377: Missing includes
+- 3101151: SfcbLocal failed to connect due to hardcoded library path
Changes in 2.2.1
================
diff --git a/cimc/cimcclient.c b/cimc/cimcclient.c
index 66cf3a2..d520fc4 100644
--- a/cimc/cimcclient.c
+++ b/cimc/cimcclient.c
@@ -51,7 +51,8 @@ CIMCEnv* NewCIMCEnv(const char *id, unsigned int options, int *rc, char **msg)
*rc=3;
snprintf(*msg,ERRLEN,"Invalid connection type '%s'. Must be 'XML' or 'SfcbLocal'.",id);
} else {
- if (strcmp(id, "SfcbLocal") == 0) {
+ if ((strcmp(id, "SfcbLocal") == 0) &&
+ ((SFCB_LIBDIR != NULL) && (strlen(SFCB_LIBDIR) > 0))) {
snprintf(libName, LIBLEN, "%s/libcimcClient%s.so",SFCB_LIBDIR,id);
} else {
snprintf(libName, LIBLEN, "libcimcClient%s.so",id);
hooks/post-receive
--
SFCC - Small Footprint CIM Client
|
|
From: Michael Chase-S. <mc...@us...> - 2011-02-28 22:27:03
|
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 701ee0f37771e6d40532b206dbee1e880e163952 (commit)
via 1733d684a90d8443682ec0733d806bf71e10b337 (commit)
via c190a3d61f4bac7647897acceb308cbc76ba982b (commit)
via 23b774fa3058db09563f41dbd35905053e5066e4 (commit)
via 126694a00a497ba3d301056494031830b6d9904a (commit)
via 9c2d7d5828897b91a6fbb827fe517f6101a804c6 (commit)
via 3b51f1fef236b9e901775fa0cb61ef0c040ed370 (commit)
from d8eae00ac5f762d2c1407d6a2ce99c64958febac (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 701ee0f37771e6d40532b206dbee1e880e163952
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 28 17:26:22 2011 -0500
create sfcCommon - ID: 3177587
commit 1733d684a90d8443682ec0733d806bf71e10b337
Merge: c190a3d61f4bac7647897acceb308cbc76ba982b d8eae00ac5f762d2c1407d6a2ce99c64958febac
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 28 16:04:25 2011 -0500
Merge branch 'master' into sfcCommon
Conflicts:
dbpAdapter.c
commit c190a3d61f4bac7647897acceb308cbc76ba982b
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 28 12:15:28 2011 -0500
create sfcCommon - ID: 3177587
commit 23b774fa3058db09563f41dbd35905053e5066e4
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 28 11:21:29 2011 -0500
create sfcCommon - ID: 3177587
commit 126694a00a497ba3d301056494031830b6d9904a
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Feb 25 18:16:53 2011 -0500
create sfcCommon - ID: 3177587
commit 9c2d7d5828897b91a6fbb827fe517f6101a804c6
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Feb 25 18:16:19 2011 -0500
create sfcCommon - ID: 3177587
commit 3b51f1fef236b9e901775fa0cb61ef0c040ed370
Author: Michael Chase-Salerno <br...@li...>
Date: Fri Feb 25 17:58:22 2011 -0500
create sfcCommon - ID: 3177587
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 75e162d..a53b018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-28 Michael Chase-Salerno <br...@li...>
+
+ * Makefile.am, configure.ac, README, most .c files:
+ [ 3177587 ] create sfcCommon library
+
2011-02-23 Chris Buccella <buc...@li...>
* providerDrv.c:
@@ -5,8 +10,8 @@
2011-01-13 Michael Chase-Salerno <br...@li...>
- * ABTScript:
- [ 3152523 ] Changes for footprinting in ABT
+ * ABTScript:
+ [ 3152523 ] Changes for footprinting in ABT
2011-02-18 Narasimha Sharoff <nsh...@us...>
diff --git a/Makefile.am b/Makefile.am
index c6f322d..2d1111b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ sfcbconfdir=$(sysconfdir)/sfcb
sfcbstatedir=$(localstatedir)/lib/sfcb
initdir=$(sysconfdir)/init.d
pamdir=$(sysconfdir)/pam.d
-sfcblibdir=$(libdir)/sfcb
cmpilibdir=$(libdir)/cmpi
MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
@@ -36,6 +35,28 @@ MANFILES=man/genSslCert.1 man/getSchema.1 man/sfcbd.1 man/sfcbmof.1 \
BUILT_SOURCES=queryParser.c queryLexer.c sqlParser.c sqlLexer.c cimXmlOps.c cimXmlParserProcessed.c $(MANFILES)
+if SFCCOMMON
+# Use the local sfcCommon libs
+ sfcblibdir=$(libdir)/sfcb
+ SFCCOMMON_LIBS = libsfcUtil.la
+ SFCCOMMON_CPPFLAGS="-I$(srcdir)/sfcUtil"
+ SFCCOMMON_HEADER = sfcUtil/hashtable.h sfcUtil/utilft.h
+libsfcUtil_la_SOURCES = \
+ sfcUtil/hashtable.c \
+ sfcUtil/utilFactory.c \
+ sfcUtil/utilHashtable.c \
+ sfcUtil/utilStringBuffer.c \
+ sfcUtil/libsfcUtil.Versions
+libsfcUtil_la_LDFLAGS = -Wl,--version-script,$(srcdir)/sfcUtil/libsfcUtil.Versions
+libsfcBrokerCore_la_LIBADD=-lsfcUtil
+libsfcBrokerCore_la_DEPENDENCIES=libsfcUtil.la
+else
+# Use shared library
+ sfccommondir=$(includedir)/sfcCommon
+ sfcblibdir=$(libdir)
+libsfcBrokerCore_la_LIBADD=
+endif
+
AM_YFLAGS=-d
AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
-DSFCB_STATEDIR=\"$(sfcbstatedir)\" \
@@ -43,7 +64,7 @@ AM_CPPFLAGS=-DSFCB_CONFDIR=\"$(sfcbconfdir)\" \
-DCMPI_LIBDIR=\"$(cmpilibdir)\" \
-DLIBDIR=\"$(libdir)\" \
-DSFCB_BINARY=\"$(sbindir)/sfcbd\" \
- -I$(srcdir)/sfcUtil \
+ $(SFCCOMMON_CPPFLAGS) \
@SFCB_CPPFLAGS@ \
@SFCB_CMPI_PLATFORM@
AM_LDFLAGS=@SFCB_LDFLAGS@
@@ -116,8 +137,8 @@ endif
sfcb_sharedobjects = \
$(sfcblibdir)/*.so
+
sfcblib_LTLIBRARIES = \
- libsfcUtil.la \
libsfcBrokerCore.la \
libsfcFileRepository.la \
libsfcInternalProvider.la \
@@ -138,6 +159,7 @@ sfcblib_LTLIBRARIES = \
$(QUALREP_LIBS) \
$(INDICATION_LIBS) \
$(PAM_LIBS) \
+ $(SFCCOMMON_LIBS) \
$(SLP_HOSTNAME_LIBS)
if TEST_ENABLED
@@ -161,13 +183,6 @@ bin_PROGRAMS = \
noinst_PROGRAMS = \
sfcbdumpP32onI32 classSchema2c
-libsfcUtil_la_SOURCES = \
- sfcUtil/hashtable.c \
- sfcUtil/utilFactory.c \
- sfcUtil/utilHashtable.c \
- sfcUtil/utilStringBuffer.c \
- sfcUtil/libsfcUtil.Versions
-libsfcUtil_la_LDFLAGS = -Wl,--version-script,$(srcdir)/sfcUtil/libsfcUtil.Versions
libsfcBrokerCore_la_SOURCES = \
args.c \
@@ -207,8 +222,6 @@ libsfcBrokerCore_la_SOURCES = \
$(QUALREP_FILES)
libsfcBrokerCore_la_CFLAGS = $(AM_CFLAGS) @SFCB_CMPI_OS@
-libsfcBrokerCore_la_LIBADD=-lsfcUtil
-libsfcBrokerCore_la_DEPENDENCIES=libsfcUtil.la
queryLexer.c: $(srcdir)/queryLexer.l
$(LEX) -t $< | sed -e "s/yy/sfcQuery/g" > $@
@@ -316,7 +329,7 @@ libsfcClassProvider_la_DEPENDENCIES=libsfcBrokerCore.la
libsfcClassProviderMem_la_SOURCES = \
classProviderMem.c classSchemaMem.c interop_classSchema.c
-libsfcClassProviderMem_la_LIBADD=-lsfcBrokerCore
+libsfcClassProviderMem_la_LIBADD=-lsfcBrokerCore -lsfcUtil
libsfcClassProviderMem_la_DEPENDENCIES=libsfcBrokerCore.la
# Building providers in the test/TestProviders directory
@@ -405,14 +418,14 @@ sfcbinst2mof_SOURCES=sfcbinst2mof.c
sfcbinst2mof_LDADD = -lsfcFileRepository
classSchema2c_SOURCES=classSchema2c.c
-classSchema2c_LDADD=-lsfcBrokerCore
-classSchema2c_DEPENDENCIES=libsfcBrokerCore.la
+classSchema2c_LDADD=-lsfcBrokerCore -lsfcUtil
+classSchema2c_DEPENDENCIES=libsfcBrokerCore.la
noinst_HEADERS=array.h $(SLP_INC) httpComm.h control.h providerMgr.h \
constClass.h msgqueue.h providerRegister.h \
cimXmlParser.h native.h support.h cimXmlGen.h \
- cimRequest.h cimRsRequest.h genericlist.h objectImpl.h trace.h \
- sfcUtil/hashtable.h sfcUtil/utilft.h mlog.h \
+ cimRequest.h cimRsRequest.h objectImpl.h trace.h \
+ mlog.h $(SFCCOMMON_HEADER) \
cmpiftx.h cmpimacsx.h \
fileRepository.h internalProvider.h \
selectexp.h queryOperation.h \
diff --git a/NEWS b/NEWS
index b1f15d6..f4a8412 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ Changes in 1.4.1
New features:
- 3152523 Changes for footprinting in ABT
- 1596336 Add config option for network interface binding
+- 3177587 create sfcCommon library
Bugs fixed:
diff --git a/README b/README
index ff1b2bb..a98707b 100644
--- a/README
+++ b/README
@@ -327,6 +327,11 @@ Options:
This option may require the GNU_SOURCE compiler flag if
building under glibc 2.8+. (CFLAGS=-D_GNU_SOURCE ./configure)
+ --disable-sfcCommon
+ Disables the sfcCommon libraries included in SFCB and uses
+ the installed shared library.
+ Default=enabled (local libraries used)
+
9. Downloading the CIM Schema
=============================
diff --git a/brokerEnc.c b/brokerEnc.c
index 4fa43ad..fce11d1 100644
--- a/brokerEnc.c
+++ b/brokerEnc.c
@@ -23,7 +23,13 @@
#include "native.h"
#include "trace.h"
#include "constClass.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
extern const char *opGetClassNameChars(const CMPIObjectPath * cop);
extern const char *opGetNameSpaceChars(const CMPIObjectPath * cop);
diff --git a/brokerUpc.c b/brokerUpc.c
index 02331f8..12228a9 100644
--- a/brokerUpc.c
+++ b/brokerUpc.c
@@ -24,14 +24,18 @@
#include "support.h"
#include "native.h"
-#include "utilft.h"
#include "providerMgr.h"
#include "providerRegister.h"
#include "objectImpl.h"
#include "msgqueue.h"
-#include "utilft.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef HAVE_INDICATIONS
#define SFCB_INCL_INDICATION_SUPPORT 1
#endif
diff --git a/cimRequest.c b/cimRequest.c
index 5008485..3e50c2b 100644
--- a/cimRequest.c
+++ b/cimRequest.c
@@ -45,13 +45,19 @@
#include "native.h"
#include "trace.h"
-#include "utilft.h"
#include "string.h"
#include "queryOperation.h"
#include "config.h"
#include "control.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SFCB_IX86
#define SFCB_ASM(x) asm(x)
#else
diff --git a/cimXmlGen.c b/cimXmlGen.c
index 46970b8..c3cf118 100644
--- a/cimXmlGen.c
+++ b/cimXmlGen.c
@@ -29,12 +29,17 @@
#include "native.h"
#include "trace.h"
-#include "utilft.h"
#include "string.h"
#include "queryOperation.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SFCB_IX86
#define SFCB_ASM(x) asm(x)
#else
diff --git a/cimXmlGen.h b/cimXmlGen.h
index 44537c6..e3fe9dd 100644
--- a/cimXmlGen.h
+++ b/cimXmlGen.h
@@ -30,9 +30,15 @@
#include "native.h"
#include "trace.h"
-#include "utilft.h"
#include "string.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "queryOperation.h"
extern CMPIValue *getKeyValueTypePtr(char *type, char *value,
diff --git a/classProviderCommon.h b/classProviderCommon.h
index 04a168a..3676ead 100644
--- a/classProviderCommon.h
+++ b/classProviderCommon.h
@@ -19,7 +19,6 @@
*
*/
-#include "utilft.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -27,6 +26,13 @@
#include <sys/types.h>
#include <dirent.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "constClass.h"
#include "providerRegister.h"
#include "trace.h"
diff --git a/classSchema2c.c b/classSchema2c.c
index e340e12..e48ea32 100644
--- a/classSchema2c.c
+++ b/classSchema2c.c
@@ -20,7 +20,6 @@
*
*/
-#include "utilft.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -34,6 +33,13 @@
#include "trace.h"
#include "control.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define NEW(x) ((x *) malloc(sizeof(x)))
#include "cmpi/cmpidt.h"
diff --git a/configure.ac b/configure.ac
index a7550cc..a4ab862 100644
--- a/configure.ac
+++ b/configure.ac
@@ -107,6 +107,13 @@ AC_ARG_ENABLE(request-types,
[AC_HELP_STRING([--enable-request-types(=TYPES)],
[Enable support of listed request types. If none are listed, all are enabled.])])
+AC_ARG_ENABLE(sfcCommon,
+ [AC_HELP_STRING([--disable-sfcCommon],
+ [Disable local sfcCommon libraries and use shared version.])],
+ [enable_sfcCommon=$enableval],
+ [enable_sfcCommon="yes"]
+ )
+
# Size checks
AC_CHECK_SIZEOF(void*)
AC_CHECK_SIZEOF(int)
@@ -226,6 +233,7 @@ AM_CONDITIONAL(CMDTEST,[test "$test_cmd" == "yes"])
AM_CONDITIONAL(SLPTEST,[test "$test_slp" == "yes"])
AM_CONDITIONAL(PROVTEST,[test "$test_providers" == "yes"])
AM_CONDITIONAL(PROVTEST,[test "$test_local" == "yes"])
+
if [test "$enable_tests"]; then
# The order of TEST_SUBDIRS determines test
# execution order.
@@ -328,6 +336,12 @@ if test "$handler_CIMRS" == "yes"; then
fi
# End of parser config
+if test "$enable_sfcCommon" == "yes"; then
+ AC_DEFINE(SFCCOMMON,,[Local sfcCommon enabled])
+else
+ AC_CHECK_LIB(sfcUtil,main,,[AC_MSG_ERROR([Could not find required sfcUtil])])
+fi
+
if test "$enable_uds" == "yes"; then
AC_DEFINE(HAVE_UDS,,[UDS authentication enabled])
fi
@@ -420,6 +434,7 @@ fi
# Checks for libraries.
AC_CHECK_LIB(pthread,main)
AC_CHECK_LIB(dl,main)
+
AC_CHECK_LIB(z,main,[SFCB_LIBZ=-lz],[AC_MSG_ERROR([Could not find required libz])])
if test "$enable_indications" = "yes" ; then
LOAD_INDICATION_PROVIDER=
@@ -531,6 +546,7 @@ AM_CONDITIONAL(DOCS,[test "$enable_docs" == "yes"])
AM_CONDITIONAL(IPV6,[test "$enable_ipv6" == "yes"])
AM_CONDITIONAL(LOCAL_CONNECT_NO_INDICATION,[test "$enable_local_connect_only" == "yes" -a "$enable_indications" == "no"])
AM_CONDITIONAL(LOCAL_CONNECT_ONLY,[test "$enable_local_connect_only" == "yes"])
+AM_CONDITIONAL(SFCCOMMON,[test "$enable_sfcCommon" == "yes"])
AC_CONFIG_FILES([Makefile sfcb.spec sfcbrepos.sh sfcbstage.sh sfcbunstage.sh
sfcbuuid.sh sfcb.cfg.pre getSchema.sh.pre
@@ -558,6 +574,7 @@ echo -e "uds"\\t\\t\\t\\t"${enable_uds:-no}"
echo -e "tests"\\t\\t\\t\\t"${enable_tests:-no}"
echo -e "debug"\\t\\t\\t\\t"${enable_debug:-no}"
echo -e "Request types"\\t\\t\\t"${enable_request_types}"
+echo -e "Local sfcCommon"\\t\\t\\t"${enable_sfcCommon}"
echo =================================================================
echo
echo "sfcb configuration complete. you may now run 'make'"
diff --git a/control.c b/control.c
index c632b8c..a26f6d3 100644
--- a/control.c
+++ b/control.c
@@ -19,7 +19,6 @@
*
*/
-#include "utilft.h"
#include "support.h"
#include "mlog.h"
#include <stdio.h>
@@ -32,6 +31,12 @@
#include "config.h"
#endif
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifndef SFCB_CONFDIR
#define SFCB_CONFDIR "/etc/sfcb"
#endif
diff --git a/elementCapabilitiesProvider.c b/elementCapabilitiesProvider.c
index db83b25..40e8539 100644
--- a/elementCapabilitiesProvider.c
+++ b/elementCapabilitiesProvider.c
@@ -25,7 +25,6 @@
*
*/
-#include "utilft.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -41,6 +40,12 @@
#include "control.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define NEW(x) ((x *) malloc(sizeof(x)))
#include "cmpi/cmpidt.h"
diff --git a/fileRepository.h b/fileRepository.h
index f31dff7..2c6a2df 100644
--- a/fileRepository.h
+++ b/fileRepository.h
@@ -19,7 +19,13 @@
*
*/
#include <stdio.h>
-#include "sfcUtil/utilft.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
#ifndef _FILEREPOSITORY_
#define _FILEREPOSITORY_
diff --git a/genericlist.h b/genericlist.h
index eeb3cc0..cb17038 100644
--- a/genericlist.h
+++ b/genericlist.h
@@ -36,7 +36,12 @@
#ifndef GENERIC_LIST_DEFINED
#define GENERIC_LIST_DEFINED
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
typedef struct GLE_struct {
void *pointer;
diff --git a/httpAdapter.c b/httpAdapter.c
index 9e5193a..7504b1b 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -41,11 +41,17 @@
#include "cmpi/cmpidt.h"
#include "msgqueue.h"
-#include "utilft.h"
#include "trace.h"
#include "cimRequest.h"
#include "support.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include <pthread.h>
#include <semaphore.h>
diff --git a/indCIMXMLExport.c b/indCIMXMLExport.c
index 0bf28ca..03eb856 100644
--- a/indCIMXMLExport.c
+++ b/indCIMXMLExport.c
@@ -20,10 +20,16 @@
*/
#include <curl/curl.h>
-#include "utilft.h"
#include "trace.h"
#include <string.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
extern UtilStringBuffer *newStringBuffer(int);
extern int getControlChars(char *id, char **val);
diff --git a/instance.c b/instance.c
index 0a034ff..ae548e8 100644
--- a/instance.c
+++ b/instance.c
@@ -23,7 +23,6 @@
#include <stdlib.h>
#include <string.h>
-#include "utilft.h"
#include "native.h"
#include "instance.h"
@@ -31,6 +30,12 @@
#include "providerMgr.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SFCB_IX86
#define SFCB_ASM(x) asm(x)
#else
diff --git a/internalProvider.c b/internalProvider.c
index 7faf646..5fded91 100644
--- a/internalProvider.c
+++ b/internalProvider.c
@@ -29,13 +29,19 @@
#include <ctype.h>
#include "providerRegister.h"
#include "fileRepository.h"
-#include "utilft.h"
#include "trace.h"
#include "constClass.h"
#include "internalProvider.h"
#include "native.h"
#include "objectpath.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define LOCALCLASSNAME "InternalProvider"
static char *interopNs = "root/interop";
diff --git a/internalProvider.h b/internalProvider.h
index d3b242f..da2ee3a 100644
--- a/internalProvider.h
+++ b/internalProvider.h
@@ -23,7 +23,13 @@
#ifndef INTERNAL_PROVIDER_H
#define INTERNAL_PROVIDER_H
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "cmpi/cmpidt.h"
CMPIStatus InternalProviderEnumInstanceNames(CMPIInstanceMI * mi,
diff --git a/interopProvider.c b/interopProvider.c
index 732608a..2f7f648 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -27,7 +27,6 @@
#include <string.h>
#include <ctype.h>
#include "fileRepository.h"
-#include "utilft.h"
#include "trace.h"
#include "queryOperation.h"
#include "providerMgr.h"
@@ -37,6 +36,13 @@
#include <time.h>
#include "instance.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define LOCALCLASSNAME "InteropProvider"
/*
diff --git a/interopServerProvider.c b/interopServerProvider.c
index 8e66ce5..2a0d8b7 100644
--- a/interopServerProvider.c
+++ b/interopServerProvider.c
@@ -19,7 +19,6 @@
*
*/
-#include "utilft.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
@@ -35,6 +34,12 @@
#include "control.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define NEW(x) ((x *) malloc(sizeof(x)))
#include "cmpi/cmpidt.h"
diff --git a/objectImpl.c b/objectImpl.c
index 6f18cc3..928d8e7 100644
--- a/objectImpl.c
+++ b/objectImpl.c
@@ -27,10 +27,15 @@
#include "objectImpl.h"
#include "array.h"
-#include "utilft.h"
#include "trace.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SFCB_IX86
#define SFCB_ASM(x) asm(x)
#else
diff --git a/objectImplSwapI32toP32.c b/objectImplSwapI32toP32.c
index fb2f7a7..8b7c68f 100644
--- a/objectImplSwapI32toP32.c
+++ b/objectImplSwapI32toP32.c
@@ -24,9 +24,15 @@
#include <byteswap.h>
#include <stdio.h>
#include <stdlib.h>
-#include "utilft.h"
#include <sys/utsname.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef SETCLPFX
#undef SETCLPFX
#endif
diff --git a/objectpath.c b/objectpath.c
index a6a71fc..3c8ab25 100644
--- a/objectpath.c
+++ b/objectpath.c
@@ -29,7 +29,13 @@
#include "native.h"
#include "msgqueue.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
extern UtilStringBuffer *newStringBuffer(int s);
diff --git a/objectpath.h b/objectpath.h
index 0dce5fb..50c796e 100644
--- a/objectpath.h
+++ b/objectpath.h
@@ -21,7 +21,12 @@
#ifndef _OBJECTPATH_H
#define _OBJECTPATH_H
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
UtilStringBuffer *normalizeObjectPathStrBuf(const CMPIObjectPath * cop);
char *normalizeObjectPathChars(const CMPIObjectPath * cop);
diff --git a/profileProvider.c b/profileProvider.c
index 532eded..664a668 100644
--- a/profileProvider.c
+++ b/profileProvider.c
@@ -29,7 +29,6 @@
#include <string.h>
#include <ctype.h>
#include "fileRepository.h"
-#include "utilft.h"
#include "trace.h"
#include "providerMgr.h"
#include "internalProvider.h"
@@ -37,6 +36,13 @@
#include "objectpath.h"
#include <time.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef HAVE_SLP
#include <slp.h>
#include "cimslpCMPI.h"
diff --git a/providerDrv.c b/providerDrv.c
index 36ed3cf..a801c29 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -31,7 +31,6 @@
#include "cmpi/cmpidt.h"
#include "providerMgr.h"
#include "providerRegister.h"
-#include "utilft.h"
#include "cimXmlParser.h"
#include "support.h"
#include "msgqueue.h"
@@ -43,6 +42,12 @@
#include "config.h"
#include "constClass.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef HAVE_QUALREP
#include "qualifier.h"
#endif
diff --git a/providerMgr.c b/providerMgr.c
index 7be2cb2..88469fd 100644
--- a/providerMgr.c
+++ b/providerMgr.c
@@ -27,7 +27,6 @@
#include "cmpi/cmpidt.h"
#include "providerRegister.h"
#include "providerMgr.h"
-#include "utilft.h"
#include "msgqueue.h"
#include "constClass.h"
#include "cimXmlParser.h"
@@ -38,6 +37,12 @@
#include "selectexp.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef HAVE_QUALREP
#include "qualifier.h"
#endif
diff --git a/providerRegister.c b/providerRegister.c
index 2e98f27..fd7ff7e 100644
--- a/providerRegister.c
+++ b/providerRegister.c
@@ -20,7 +20,6 @@
*
*/
-#include "utilft.h"
#include "mlog.h"
#include <stdio.h>
#include <stdlib.h>
@@ -29,6 +28,13 @@
#include <support.h>
#include <pwd.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "providerRegister.h"
static ProviderInfo forceNotFound = { "", FORCE_PROVIDER_NOTFOUND };
diff --git a/providerRegister.h b/providerRegister.h
index 88f4316..ef4e10b 100644
--- a/providerRegister.h
+++ b/providerRegister.h
@@ -28,11 +28,17 @@
#include "cmpi/cmpift.h"
#include "cmpiftx.h"
#include "msgqueue.h"
-#include "utilft.h"
#include "providerMgr.h"
#include <time.h>
#include <pwd.h>
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
diff --git a/result.c b/result.c
index 6521279..3f144bf 100644
--- a/result.c
+++ b/result.c
@@ -24,10 +24,16 @@
#include "providerMgr.h"
#include "constClass.h"
#include "queryOperation.h"
-#include "utilft.h"
#include "objectImpl.h"
#include "mlog.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
extern void native_array_reset_size(CMPIArray *array,
CMPICount increment);
extern MsgSegment setInstanceMsgSegment(CMPIInstance *ci);
diff --git a/sfcBroker.c b/sfcBroker.c
index 34972b2..6c114eb 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -22,7 +22,14 @@
#include <stdio.h>
#include "native.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "string.h"
#include "cimXmlParser.h"
// #include "brokerOs.c"
diff --git a/sqlParser.y b/sqlParser.y
index 573dce3..e61948d 100644
--- a/sqlParser.y
+++ b/sqlParser.y
@@ -34,7 +34,13 @@
#include <errno.h>
#include "queryOperation.h"
#include "sqlStatement.h"
+
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
#define YYPARSE_PARAM parm
#define YYLEX_PARAM parm
diff --git a/sqlStatement.c b/sqlStatement.c
old mode 100755
new mode 100644
index d7e78a0..825e5f7
--- a/sqlStatement.c
+++ b/sqlStatement.c
@@ -20,7 +20,6 @@
*/
#include "sqlStatement.h"
-#include "utilft.h"
#include "cimXmlParser.h" // Provider operationen
#include "cmpi/cmpidt.h"
@@ -29,6 +28,12 @@
#include "cmpi/cmpimacs.h"
#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include <stdio.h>
#include <string.h>
#include <malloc.h>
diff --git a/sqlStatement.h b/sqlStatement.h
index 2b47a80..89dcb42 100644
--- a/sqlStatement.h
+++ b/sqlStatement.h
@@ -19,11 +19,16 @@
*
*/
-#include "utilft.h"
-
#include "cmpi/cmpimacs.h"
#include "avltree.h"
+#include "config.h"
+#ifdef SFCCOMMON
+#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#define DEFAULTDB "root/cimv2"
/*
* SqlStatement.type:
diff --git a/support.c b/support.c
index 3d3a1ee..f08b5c8 100644
--- a/support.c
+++ b/support.c
@@ -720,7 +720,13 @@ releaseHeap(void *hc)
_SFCB_EXIT();
}
+#include "config.h"
+#ifdef SFCCOMMON
#include "utilft.h"
+#else
+#include <sfcCommon/utilft.h>
+#endif
+
#include "providerRegister.h"
ProviderRegister *pReg = NULL;
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2011-02-23 23:18:43
|
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 d8eae00ac5f762d2c1407d6a2ce99c64958febac (commit)
from 0ae4e474a4f4f45c0b6ca0ae1db848ff492a269b (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 d8eae00ac5f762d2c1407d6a2ce99c64958febac
Author: buccella <buc...@li...>
Date: Wed Feb 23 18:18:48 2011 -0500
[ 3175770 ] execQuery returns multiple instances of same object
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index d0da56d..75e162d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-23 Chris Buccella <buc...@li...>
+
+ * providerDrv.c:
+ [ 3175770 ] execQuery returns multiple instances of same object
+
2011-01-13 Michael Chase-Salerno <br...@li...>
* ABTScript:
diff --git a/NEWS b/NEWS
index 06013a9..b1f15d6 100644
--- a/NEWS
+++ b/NEWS
@@ -63,6 +63,7 @@ Bugs fixed:
- 3054618 mofpp is overaggressive when detecting comments
- 3172080 deliverIndication does not check for matching FROM classes
- 3185178 Wrong classname for returned instances from execQuery
+- 3175770 execQuery returns multiple instances of same object
Changes in 1.3.10
=================
diff --git a/providerDrv.c b/providerDrv.c
index 0eccaa9..36ed3cf 100644
--- a/providerDrv.c
+++ b/providerDrv.c
@@ -100,6 +100,21 @@ char *opsName[];
#define PROVIDERLOAD_DLFLAG (RTLD_NOW | RTLD_GLOBAL)
#endif
+#ifndef HAVE_OPTIMIZED_ENUMERATION
+ /* not a special provider, perform class name substitution if call is for a
+ parent class of the class the provider is registered for */
+#define REPLACE_CN(info,path) \
+ if (info->className && info->className[0] != '$') { \
+ char * classname = CMGetCharPtr(CMGetClassName(path,NULL)); \
+ char * namespace = CMGetCharPtr(CMGetNameSpace(path,NULL)); \
+ if (classname && namespace && strcasecmp(info->className,classname)) { \
+ CMPIObjectPath * provPath = CMNewObjectPath(Broker,namespace,info->className,NULL); \
+ if (provPath && CMClassPathIsA(Broker,provPath,classname,NULL)) { \
+ _SFCB_TRACE(1, ("--- Replacing class name %s",info->className)); \
+ path = provPath; \
+ } } }
+#endif
+
extern CMPIBroker *Broker;
extern unsigned long exFlags;
@@ -2036,22 +2051,7 @@ enumInstances(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
char **props = NULL;
#ifndef HAVE_OPTIMIZED_ENUMERATION
- if (info->className && info->className[0] != '$') {
- /*
- * not a special provider, perform class name substitution if call is
- * for a parent class of the class the provider is registered for
- */
- char *classname = CMGetCharPtr(CMGetClassName(path, NULL));
- char *namespace = CMGetCharPtr(CMGetNameSpace(path, NULL));
- if (classname && namespace && strcasecmp(info->className, classname)) {
- CMPIObjectPath *provPath =
- CMNewObjectPath(Broker, namespace, info->className, NULL);
- if (provPath && CMClassPathIsA(Broker, provPath, classname, NULL)) {
- _SFCB_TRACE(1, ("--- Replacing class name %s", info->className));
- path = provPath;
- }
- }
- }
+ REPLACE_CN(info,path);
#endif
if (req->hdr.flags & FL_localOnly)
@@ -2108,22 +2108,7 @@ enumInstanceNames(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
CMPIFlags flgs = 0;
#ifndef HAVE_OPTIMIZED_ENUMERATION
- if (info->className && info->className[0] != '$') {
- /*
- * not a special provider, perform class name substitution if call is
- * for a parent class of the class the provider is registered for
- */
- char *classname = CMGetCharPtr(CMGetClassName(path, NULL));
- char *namespace = CMGetCharPtr(CMGetNameSpace(path, NULL));
- if (classname && namespace && strcasecmp(info->className, classname)) {
- CMPIObjectPath *provPath =
- CMNewObjectPath(Broker, namespace, info->className, NULL);
- if (provPath && CMClassPathIsA(Broker, provPath, classname, NULL)) {
- _SFCB_TRACE(1, ("--- Replacing class name %s", info->className));
- path = provPath;
- }
- }
- }
+ REPLACE_CN(info,path);
#endif
ctx->ft->addEntry(ctx, CMPIInvocationFlags, (CMPIValue *) & flgs,
@@ -2262,6 +2247,10 @@ execQuery(BinRequestHdr * hdr, ProviderInfo * info, int requestor)
_SFCB_RETURN(resp);
}
+#ifndef HAVE_OPTIMIZED_ENUMERATION
+ REPLACE_CN(info,path);
+#endif
+
qs->propSrc.getValue = queryGetValue;
qs->propSrc.sns = qs->sns;
// qs->cop=CMNewObjectPath(Broker,"*",qs->fClasses[0],NULL);
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Narasimha S. <nsh...@us...> - 2011-02-22 19:04:40
|
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 "SFCC - Small Footprint CIM Client".
The branch, master has been updated
via 627f38949536e3acb43063d9f8e321811e0683e2 (commit)
from 71937c7660f2398bb97c2e1b9a83ae7e24f49825 (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 627f38949536e3acb43063d9f8e321811e0683e2
Author: Narasimha Sharoff <nsh...@us...>
Date: Tue Feb 22 11:03:12 2011 -0800
[2793377] Missing includes
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index ec0de89..a2d477b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-22 Narasimha Sharoff <nsh...@us...>
+
+ * cimc/cimcclient.c, TEST/show.c, TEST/test.c, TEST/test_gc.c
+ [ 2793377 ] Missing includes
+ (patch to add <string.h> in cimcclient.c by Miska, miska_tx)
+
2011-01-13 Chris Buccella <buc...@li...>
* backend/cimxml/cimXmlParser.c:
diff --git a/NEWS b/NEWS
index 9d173f7..6a6d221 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bugs:
- 3043282: XML gen for embedded instances for invokeMethod is incorrect
- 3059060: 'struct _CIMCArgsFT' not defined in cimc/cimcft.h
- 2348900: Concurrency issue when parsing responses
+- 2793377: Missing includes
Changes in 2.2.1
================
diff --git a/TEST/show.c b/TEST/show.c
index 0ae7d86..0621133 100755
--- a/TEST/show.c
+++ b/TEST/show.c
@@ -20,6 +20,7 @@
#include <cmci.h>
#include <native.h>
#include <unistd.h>
+#include <stdlib.h>
#include <string.h>
#include "show.h"
diff --git a/TEST/test.c b/TEST/test.c
index 6efc2aa..5f650e5 100755
--- a/TEST/test.c
+++ b/TEST/test.c
@@ -20,6 +20,7 @@
#include <cmci.h>
#include <native.h>
#include <unistd.h>
+#include <stdlib.h>
#include <string.h>
static char * _HOSTNAME;
diff --git a/TEST/test_gc.c b/TEST/test_gc.c
index b94f10b..c732513 100755
--- a/TEST/test_gc.c
+++ b/TEST/test_gc.c
@@ -46,7 +46,7 @@ int main()
cim_host_userid, cim_host_passwd, &status);
if (cc == NULL || status.rc != CMPI_RC_OK) {
- fprintf (stderr, "Connect failed: client handle = %x, status.rc = %d\n", cc, status.rc);
+ fprintf (stderr, "Connect failed: client handle = %p, status.rc = %d\n", cc, status.rc);
return -1;
}
diff --git a/cimc/cimcclient.c b/cimc/cimcclient.c
index 9f29a24..66cf3a2 100644
--- a/cimc/cimcclient.c
+++ b/cimc/cimcclient.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <dlfcn.h>
+#include <string.h>
/*
* Canonical CIM C API entry points
hooks/post-receive
--
SFCC - Small Footprint CIM Client
|
|
From: Michael Chase-S. <mc...@us...> - 2011-02-21 17:45:38
|
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 0ae4e474a4f4f45c0b6ca0ae1db848ff492a269b (commit)
from 0a679f01ec554f2d6d4a08168275a67e76660d35 (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 0ae4e474a4f4f45c0b6ca0ae1db848ff492a269b
Author: Michael Chase-Salerno <br...@li...>
Date: Mon Feb 21 12:44:56 2011 -0500
[ 3152523 ] Changes for footprinting in ABT
delta computation trips on bad input
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 0f761b3..d0da56d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-13 Michael Chase-Salerno <br...@li...>
+
+ * ABTScript:
+ [ 3152523 ] Changes for footprinting in ABT
+
2011-02-18 Narasimha Sharoff <nsh...@us...>
* cimXmlGen.c, cmpiTestExecQueryProvider.c
diff --git a/test/ABT/ABTScript b/test/ABT/ABTScript
index 72fe5af..05fbfbd 100755
--- a/test/ABT/ABTScript
+++ b/test/ABT/ABTScript
@@ -176,6 +176,10 @@ FIND_DELTA()
if (($DELTA))
then
prev=$(grep $1 $FPPREV | cut -d":" -f2)
+ if [ -z $prev ]
+ then
+ prev=0
+ fi
del=$(($2-$prev))
delta="(delta:$del)"
fi
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Narasimha S. <nsh...@us...> - 2011-02-18 17:08:13
|
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 0a679f01ec554f2d6d4a08168275a67e76660d35 (commit)
from 1fd3857ec1e63cf39fcc78857feb2affe92c99d5 (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 0a679f01ec554f2d6d4a08168275a67e76660d35
Author: Narasimha Sharoff <nsh...@us...>
Date: Fri Feb 18 09:05:00 2011 -0800
[ 3185034 ] exec query test failures on power - char16 mismatch
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index d4c1465..0f761b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-18 Narasimha Sharoff <nsh...@us...>
+
+ * cimXmlGen.c, cmpiTestExecQueryProvider.c
+ [ 3185034 ] exec query test failures on power - char16 mismatch
+
2011-02-17 Chris Buccella <buc...@li...>
* result.c, test/xmltest/execQuery.lines:
diff --git a/NEWS b/NEWS
index da37c62..06013a9 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Bugs fixed:
- 3175888 Remove JDBC support from SFCB 1.4.x
- 3082573 Typo in interopProvider
- 3177707 ExecQuery 1 to 4 tests segfault on power LPAR
+- 3185034 exec query test failures on power - char16 mismatch
Changes in 1.4.0
================
diff --git a/cimXmlGen.c b/cimXmlGen.c
index 0434542..46970b8 100644
--- a/cimXmlGen.c
+++ b/cimXmlGen.c
@@ -500,7 +500,8 @@ value2xml(CMPIData d, UtilStringBuffer * sb, int wv)
else if (d.type == CMPI_boolean)
splen = sprintf(str, "%s", d.value.boolean ? "TRUE" : "FALSE");
else if (d.type == CMPI_char16)
- splen = sprintf(str, "%c", d.value.char16);
+ /* To support wide charset/unicode charset, review this line */
+ splen = sprintf(str, "%c", (CMPIChar16)d.value.char16);
else if (d.type == CMPI_chars) {
sp = XMLEscape(d.value.chars, &splen);
if (sp)
diff --git a/test/TestProviders/cmpiTestExecQueryProvider.c b/test/TestProviders/cmpiTestExecQueryProvider.c
index 5f6f619..e0d0ba6 100644
--- a/test/TestProviders/cmpiTestExecQueryProvider.c
+++ b/test/TestProviders/cmpiTestExecQueryProvider.c
@@ -232,6 +232,7 @@ _setProperty(CMPIInstance *ci, const char *p)
CMPIValue val;
const char *property;
CMPIStatus rc = { CMPI_RC_OK, NULL };
+ CMPIChar16 c_val = 0x0063;
if (strncmp(p, _ClassName, _ClassName_size) == 0) {
property = p + _ClassName_size + 1;
} else
@@ -246,7 +247,7 @@ _setProperty(CMPIInstance *ci, const char *p)
else if ((strncmp(property, "s", 1) == 0) && (strlen(property) == 1)) {
rc = CMSetProperty(ci, "s", (CMPIValue *) "Hello", CMPI_chars);
} else if ((strncmp(property, "c", 1) == 0) && (strlen(property) == 1)) {
- rc = CMSetProperty(ci, "c", (CMPIValue *) "c", CMPI_char16);
+ rc = CMSetProperty(ci, "c", (CMPIValue *) &c_val, CMPI_char16);
}
else if ((strncmp(property, "n32", 3) == 0) && (strlen(property) == 3)) {
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2011-02-17 21:45:24
|
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 1fd3857ec1e63cf39fcc78857feb2affe92c99d5 (commit)
from c0cc2281e191aced430626ef18fd1819010e6c93 (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 1fd3857ec1e63cf39fcc78857feb2affe92c99d5
Author: buccella <buc...@li...>
Date: Thu Feb 17 16:45:25 2011 -0500
[ 3185178 ] Wrong classname for returned instances from execQuery
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 86a2ad5..d4c1465 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-17 Chris Buccella <buc...@li...>
+
+ * result.c, test/xmltest/execQuery.lines:
+ [ 3185178 ] Wrong classname for returned instances from execQuery
+
2011-02-14 Narasimha Sharoff <nsh...@us...>
* cmpiTestExecQueryProvider.c
diff --git a/NEWS b/NEWS
index 5d3c734..da37c62 100644
--- a/NEWS
+++ b/NEWS
@@ -61,6 +61,7 @@ Bugs fixed:
- 3130727 CMPIPropertyMIFT.setProperty() missing objectpath keys
- 3054618 mofpp is overaggressive when detecting comments
- 3172080 deliverIndication does not check for matching FROM classes
+- 3185178 Wrong classname for returned instances from execQuery
Changes in 1.3.10
=================
diff --git a/result.c b/result.c
index baa0cd8..6521279 100644
--- a/result.c
+++ b/result.c
@@ -295,6 +295,7 @@ __rft_returnInstance(const CMPIResult *result,
if (r->qs) {
int irc;
+ /* true for ExecQuery requests */
if (r->qs->where) {
r->qs->propSrc.data = (CMPIInstance *) instance;
irc = r->qs->where->ft->evaluate(r->qs->where, &r->qs->propSrc);
@@ -302,7 +303,7 @@ __rft_returnInstance(const CMPIResult *result,
if (r->qs->allProps == 0) {
instance =
r->qs->ft->cloneAndFilter(r->qs, (CMPIInstance *) instance,
- r->qs->cop, r->qs->keys);
+ CMGetObjectPath(instance,NULL), r->qs->keys);
releaseInstance = 1;
}
} else
@@ -311,7 +312,7 @@ __rft_returnInstance(const CMPIResult *result,
if (r->qs->allProps == 0) {
instance =
r->qs->ft->cloneAndFilter(r->qs, (CMPIInstance *) instance,
- r->qs->cop, r->qs->keys);
+ CMGetObjectPath(instance,NULL), r->qs->keys);
releaseInstance = 1;
}
}
diff --git a/test/xmltest/execQuery.lines b/test/xmltest/execQuery.lines
index 296c037..81e8bd6 100644
--- a/test/xmltest/execQuery.lines
+++ b/test/xmltest/execQuery.lines
@@ -4,7 +4,7 @@
<SIMPLERSP>
<IMETHODRESPONSE NAME="ExecQuery">
<IRETURNVALUE>
-<INSTANCE CLASSNAME="CIM_ComputerSystem">
+<INSTANCE CLASSNAME="Linux_ComputerSystem">
<PROPERTY NAME="NameFormat" TYPE="string">
<VALUE>IP</VALUE>
</PROPERTY>
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2011-02-08 21:03:50
|
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 48f1fc45b34a78134b28e2a45859ba59990fdbf7 (commit)
from e527df541129c5ff238fad6f80919b87f69d7696 (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 48f1fc45b34a78134b28e2a45859ba59990fdbf7
Author: buccella <buc...@li...>
Date: Tue Feb 8 16:03:42 2011 -0500
[ 3082573 ] Typo in interopProvider
-----------------------------------------------------------------------
Summary of changes:
diff --git a/ChangeLog b/ChangeLog
index 061955c..06c5e5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2011-02-08 Chris Buccella <buc...@li...>
+ * interopProvider.c:
+ [ 3082573 ] Typo in interopProvider
+
* dbpAdapter.c, Makefile.am, configure.ac, control.c,
sfcVersion.h, sfcb.cfg.pre.in, README:
[ 3175888 ] Remove JDBC support from SFCB 1.4.x
diff --git a/NEWS b/NEWS
index 0cda63d..41b7bbd 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ Bugs fixed:
- 3022940 Remove dead SLP code dealing with proc management
- 3162016 sfcbd Segmentation fault in cleanupCimXmlRequest
- 3175888 Remove JDBC support from SFCB 1.4.x
+- 3082573 Typo in interopProvider
Changes in 1.4.0
================
diff --git a/interopProvider.c b/interopProvider.c
index 71c1c1b..732608a 100644
--- a/interopProvider.c
+++ b/interopProvider.c
@@ -1349,7 +1349,7 @@ InteropProviderInvokeMethod(CMPIMethodMI * mi,
} else
removeHandler(ha, key);
} else {
- setStatus(&st, CMPI_RC_ERR_NOT_FOUND, "Handler objectnot found");
+ setStatus(&st, CMPI_RC_ERR_NOT_FOUND, "Handler object not found");
}
if (key)
free(key);
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
|
From: Chris B. <buc...@us...> - 2011-02-08 20:57:54
|
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 e527df541129c5ff238fad6f80919b87f69d7696 (commit)
from bc2624be0d04379a2701df5bfb2537ecfded7432 (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 e527df541129c5ff238fad6f80919b87f69d7696
Author: buccella <buc...@li...>
Date: Tue Feb 8 15:57:37 2011 -0500
[ 3175888 ] Remove JDBC support from SFCB 1.4.x
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 +
Makefile.am | 20 --
NEWS | 1 +
README | 3 -
configure.ac | 10 -
control.c | 8 -
dbpAdapter.c | 803 -------------------------------------------------------
sfcVersion.h | 2 -
sfcb.cfg.pre.in | 12 -
9 files changed, 7 insertions(+), 858 deletions(-)
hooks/post-receive
--
SFCB - Small Footprint CIM Broker
|
