sblim-commit — CVS Commit Info for SBLIM

[Sblim-commit] Git: sfcc- Small Footprint CIM Client branch, master, updated. 28d9fdc4fd33a9089e5f4886d53f43fd04e29f9e

[Dave H. <hel...@us...>]

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  28d9fdc4fd33a9089e5f4886d53f43fd04e29f9e (commit)
      from  1152bbf7b9aba98e668dd4589ca5ecb97351896e (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 28d9fdc4fd33a9089e5f4886d53f43fd04e29f9e
Author: Dave Heller <hel...@us...>
Date:   Thu Mar 27 21:30:57 2014 -0400

    prep for 2.2.7 release

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |   11 +++++++++++
 configure.ac |    2 +-
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 1593173..8a57941 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,16 @@
 Small Footprint CIM Client Library NEWS
 
+Changes in 2.2.7
+================
+
+New Features:
+- [bugs:#2692] SFCC: SfcbLocal interface should expose markHeap() and releaseHeap()
+
+Bugs:
+- [bugs:#2728] Missing tag definition for REFARRAY
+- [bugs:#2729] Improper type handling for EmbeddedObject in PARAMVALUE
+- [bugs:#2730] More memory leaks in backend/cimxml/grammer.c
+
 Changes in 2.2.6
 ================
 
diff --git a/configure.ac b/configure.ac
index 4867079..90adc92 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(sblim-sfcc, 2.2.7preview, sbl...@li...)
+AC_INIT(sblim-sfcc, 2.2.7, sbl...@li...)
 AC_CONFIG_SRCDIR([cimc/cimcclient.c])
 AC_CONFIG_HEADER([config.h])
 


hooks/post-receive
-- 
sfcc- Small Footprint CIM Client

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-513-gdb4cac6

[Dave H. <hel...@us...>]

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  db4cac6290045085f277597fefdbcf33ae4e8d51 (commit)
      from  98b54e0aee6d683d821c2004389776037d851f60 (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 db4cac6290045085f277597fefdbcf33ae4e8d51
Author: Dave Heller <hel...@us...>
Date:   Wed Mar 26 20:16:34 2014 -0400

    bump version number

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |    8 ++++++++
 configure.ac |    2 +-
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 42ad6cb..d1562cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+Changes in 1.4.9
+================
+
+New features:
+
+Bugs fixed:
+
+
 Changes in 1.4.8
 ================
 
diff --git a/configure.ac b/configure.ac
index 5fbe510..17dc966 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(Small Footprint CIM Broker, 1.4.8, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.4.9-preview, sbl...@li..., sblim-sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
 
 #disable "seems to ignore the --datarootdir setting" warnings


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker tag, SFCB_1_4_8, created. SFCB_1_4_0-512-g98b54e0

[Dave H. <hel...@us...>]

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 tag, SFCB_1_4_8 has been created
        at  98b54e0aee6d683d821c2004389776037d851f60 (commit)

- Log -----------------------------------------------------------------
commit 98b54e0aee6d683d821c2004389776037d851f60
Author: Dave Heller <hel...@us...>
Date:   Wed Mar 26 20:13:11 2014 -0400

    prep for 1.4.8 release
-----------------------------------------------------------------------


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-512-g98b54e0

[Dave H. <hel...@us...>]

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  98b54e0aee6d683d821c2004389776037d851f60 (commit)
      from  0b313d3cb801e0864101854742ada8361be38f1a (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 98b54e0aee6d683d821c2004389776037d851f60
Author: Dave Heller <hel...@us...>
Date:   Wed Mar 26 20:13:11 2014 -0400

    prep for 1.4.8 release

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |   12 +++++++++++-
 configure.ac |    2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index b4a0142..42ad6cb 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,19 @@ Changes in 1.4.8
 ================
 
 New features:
+- [sfcb-tix:#99] Add config property enableSslCipherServerPref
+- [sfcb-tix:#101] Add config property indicationCurlUseExpect100
+- [sfcb-tix:#102] Add config property indicationCurlHonorRedirect
+- [sfcb-tix:#105] Add config property embeddedObjectEncoding
 
 Bugs fixed:
-
+- [sfcb-tix:#94] Increase sigChldWaitTime
+- [sfcb-tix:#95] Do not release pthread lock prior to stopBroker() exit
+- [sfcb-tix:#89] Gracefully handle providers doing abort()
+- [sfcb-tix:#96] Provider should close req handler on shutdown
+- [sfcb-tix:#98] sfcbmofpp segfaults if mof file ends with block comment without newline
+- [sfcb-tix:#100] Fix some compiler warnings & errors on newer distros
+- [sfcb-tix:#103] Unsafe usage of strncpy in providerRegister.c
 
 Changes in 1.4.7
 ================
diff --git a/configure.ac b/configure.ac
index 609209b..5fbe510 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(Small Footprint CIM Broker, 1.4.8-preview, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.4.8, sbl...@li..., sblim-sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
 
 #disable "seems to ignore the --datarootdir setting" warnings


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. 3da37618f260329e292a8d5e7be0546f4f17c1a9

[Dave H. <hel...@us...>]

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_1.3 has been updated
       via  3da37618f260329e292a8d5e7be0546f4f17c1a9 (commit)
      from  4475f299a36e152b6cac6fb09e0b78a241938a13 (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 3da37618f260329e292a8d5e7be0546f4f17c1a9
Author: Dave Heller <hel...@us...>
Date:   Wed Mar 26 18:32:18 2014 -0400

    bump version number

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |    7 +++++++
 configure.ac |    2 +-
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/NEWS b/NEWS
index 2c81b96..a28ea6d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Changes in 1.3.19
+=================
+
+New features:
+
+Bugs fixed:
+
 Changes in 1.3.18
 =================
 
diff --git a/configure.ac b/configure.ac
index acee75f..8ddfae7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(Small Footprint CIM Broker, 1.3.18, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.3.19-preview, sbl...@li..., sblim-sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
 
 #disable "seems to ignore the --datarootdir setting" warnings


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker tag, SFCB_1_3_18, created. 4475f299a36e152b6cac6fb09e0b78a241938a13

[Dave H. <hel...@us...>]

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 tag, SFCB_1_3_18 has been created
        at  4475f299a36e152b6cac6fb09e0b78a241938a13 (commit)

- Log -----------------------------------------------------------------
commit 4475f299a36e152b6cac6fb09e0b78a241938a13
Author: Dave Heller <hel...@us...>
Date:   Wed Mar 26 18:23:15 2014 -0400

    prep for 1.3.18 release
-----------------------------------------------------------------------


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. 4475f299a36e152b6cac6fb09e0b78a241938a13

[Dave H. <hel...@us...>]

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_1.3 has been updated
       via  4475f299a36e152b6cac6fb09e0b78a241938a13 (commit)
      from  fab104b9b6b2aeeac5d8a0bdf0179f9aa6857493 (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 4475f299a36e152b6cac6fb09e0b78a241938a13
Author: Dave Heller <hel...@us...>
Date:   Wed Mar 26 18:23:15 2014 -0400

    prep for 1.3.18 release

-----------------------------------------------------------------------

Summary of changes:
 NEWS         |   19 +++++++++++++++++--
 configure.ac |    2 +-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/NEWS b/NEWS
index 9fd9865..2c81b96 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,28 @@
 Changes in 1.3.18
-================
+=================
 
 New features:
+- [sfcb-tix:#70] Reload SSL context without restarting httpd
+- [sfcb-tix:#86] Support configurable SSL Diffie Hellman parameters file
+- [sfcb-tix:#87] Support configurable SSL ECDH elliptic curve name
+- [sfcb-tix:#99] Add config property enableSslCipherServerPref
 
 Bugs fixed:
 - [sfcb-tix:#56] Intermittent segfault at shutdown
+- [sfcb-tix:#69] Fix logger for long-lived clients, was: "#2347 Don't spawn logger for clients"
+- [sfcb-tix:#78] Missing null check in ift_getObjectPath, transposed debug stmts in memAlloc
+- [sfcb-tix:#78] Simplify mutex handling in instance.c
+- [sfcb-tix:#81] Bad CMPIType assignment in cimXmlOps
+- [sfcb-tix:#83] Add Alternate getObjectPath() for SfcbLocal Connections
+- [sfcb-tix:#82] ClientEnvFT for SfcbLocal doesn't match SFCC
+- [sfcb-tix:#85] SFCB: SfcbLocal interface should expose markHeap() and releaseHeap()
+- [sfcb-tix:#84] Upcall mutex not freed on shutdown
+- [sfcb-tix:#85] SFCB: SfcbLocal interface should expose markHeap() and releaseHeap()
+- [sfcb-tix:#92] indicationDeliveryThreadLimit not properly enforced
+- [sfcb-tix:#93] ProfileProvider segfault while stopping slpUpdate thread
 
 Changes in 1.3.17
-================
+=================
 
 New features:
 - 3597805 Restart HTTP daemon without restarting SFCB
diff --git a/configure.ac b/configure.ac
index 98f0bc0..acee75f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(Small Footprint CIM Broker, 1.3.18-preview, sbl...@li..., sblim-sfcb)
+AC_INIT(Small Footprint CIM Broker, 1.3.18, sbl...@li..., sblim-sfcb)
 AC_CONFIG_SRCDIR([providerDrv.c])
 
 #disable "seems to ignore the --datarootdir setting" warnings


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcc- Small Footprint CIM Client branch, master, updated. 1152bbf7b9aba98e668dd4589ca5ecb97351896e

[Dave H. <hel...@us...>]

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  1152bbf7b9aba98e668dd4589ca5ecb97351896e (commit)
      from  45dc847702ba198b61f7fbcfadb5c137b58493e3 (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 1152bbf7b9aba98e668dd4589ca5ecb97351896e
Author: Dave Heller <hel...@us...>
Date:   Tue Mar 25 19:40:10 2014 -0400

    [bugs:#2730] More memory leaks in backend/cimxml/grammer.c

-----------------------------------------------------------------------

Summary of changes:
 backend/cimxml/grammar.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/backend/cimxml/grammar.c b/backend/cimxml/grammar.c
index 9e543c9..ac1b4e4 100644
--- a/backend/cimxml/grammar.c
+++ b/backend/cimxml/grammar.c
@@ -444,6 +444,7 @@ static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 			className(parm, (parseUnion*)&lvalp.xtokClassName);
 			op = newCMPIObjectPath(NULL, lvalp.xtokClassName.value, NULL);
 			simpleArrayAdd(parm->respHdr.rvArray,(CMPIValue*)&op,CMPI_ref);
+			if(op) op->ft->release(op);
 			ct = localLex(&lvalp, parm);
 		}
 		while(ct == XTOK_CLASSNAME);
@@ -467,6 +468,7 @@ static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 			instanceName(parm, (parseUnion*)&lvalp.xtokInstanceName);
 			createPath(&op, &lvalp.xtokInstanceName);
 			simpleArrayAdd(parm->respHdr.rvArray,(CMPIValue*)&op,CMPI_ref);
+			if(op) op->ft->release(op);
 			ct = localLex(&lvalp, parm);
 		}
 		while(ct == XTOK_INSTANCENAME);
@@ -482,6 +484,7 @@ static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 			//setInstQualifiers(inst, &lvalp.xtokNamedInstance.instance.qualifiers);
 			setInstProperties(inst, &lvalp.xtokNamedInstance.instance.properties);
 			simpleArrayAdd(parm->respHdr.rvArray,(CMPIValue*)&inst,CMPI_instance);
+			if(op) op->ft->release(op);
 			ct = localLex(&lvalp, parm);
 		}
 		while(ct == XTOK_VALUENAMEDINSTANCE);
@@ -495,6 +498,7 @@ static void iReturnValueContent(ParserControl *parm, parseUnion *stateUnion)
 			CMSetNameSpace(op, lvalp.xtokObjectPath.path.path.nameSpacePath.value);
 			CMSetHostname(op, lvalp.xtokObjectPath.path.path.host.host);
 			simpleArrayAdd(parm->respHdr.rvArray,(CMPIValue*)&op,CMPI_ref);
+			if(op) op->ft->release(op);
 			ct = localLex(&lvalp, parm);
 		}
 		while(ct == XTOK_OBJECTPATH);


hooks/post-receive
-- 
sfcc- Small Footprint CIM Client

[Sblim-commit] Git: sfcc- Small Footprint CIM Client branch, master, updated. 45dc847702ba198b61f7fbcfadb5c137b58493e3

[Dave H. <hel...@us...>]

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  45dc847702ba198b61f7fbcfadb5c137b58493e3 (commit)
      from  4d204e8c0576ade0973bd19dd57cce228b7085be (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 45dc847702ba198b61f7fbcfadb5c137b58493e3
Author: Dave Heller <hel...@us...>
Date:   Tue Mar 25 19:37:39 2014 -0400

    [bugs:#2729] Improper type handling for EmbeddedObject in PARAMVALUE

-----------------------------------------------------------------------

Summary of changes:
 backend/cimxml/cimXmlParser.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c
index c3d7dc7..d1ab86e 100644
--- a/backend/cimxml/cimXmlParser.c
+++ b/backend/cimxml/cimXmlParser.c
@@ -605,6 +605,14 @@ static int procParamValue(parseUnion * lvalp, ParserControl * parm)
          if (attr[1].attr) {
             lvalp->xtokParamValue.type = xmlToCmpiType(attr[1].attr);
          }
+         if (attr[2].attr) {
+           if (strcasecmp(attr[2].attr, "instance") == 0
+               || strcasecmp(attr[2].attr, "object") == 0) {
+             lvalp->xtokParamValue.type = CMPI_instance;
+           } else {
+             Throw(NULL, "Invalid value for attribute EmbeddedObject");
+           }
+         }
          return XTOK_PARAMVALUE;
       }
    }


hooks/post-receive
-- 
sfcc- Small Footprint CIM Client

[Sblim-commit] Git: sfcc- Small Footprint CIM Client branch, master, updated. 4d204e8c0576ade0973bd19dd57cce228b7085be

[Dave H. <hel...@us...>]

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  4d204e8c0576ade0973bd19dd57cce228b7085be (commit)
      from  4afcd398906552b969d8169c861759802cfa64b1 (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 4d204e8c0576ade0973bd19dd57cce228b7085be
Author: Dave Heller <hel...@us...>
Date:   Tue Mar 25 19:26:13 2014 -0400

    [bugs:#2728] Missing tag definition for REFARRAY

-----------------------------------------------------------------------

Summary of changes:
 backend/cimxml/cimXmlParser.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/backend/cimxml/cimXmlParser.c b/backend/cimxml/cimXmlParser.c
index d1c312f..c3d7dc7 100644
--- a/backend/cimxml/cimXmlParser.c
+++ b/backend/cimxml/cimXmlParser.c
@@ -1237,6 +1237,7 @@ static Tags tags[] = {
    {TAG("VALUE.ARRAY"), procValueArray, ZTOK_VALUEARRAY},
    {TAG("VALUE.NAMEDINSTANCE"), procValueNamedInstance, ZTOK_VALUENAMEDINSTANCE},
    {TAG("VALUE.REFERENCE"), procValueReference, ZTOK_VALUEREFERENCE},
+   {TAG("VALUE.REFARRAY"), procValueRefArray, ZTOK_VALUEREFARRAY},
    {TAG("VALUE.OBJECTWITHPATH"), procValueObjectWithPath, ZTOK_VALUEOBJECTWITHPATH},
    {TAG("VALUE"), procValue, ZTOK_VALUE},
    {TAG("HOST"), procHost, ZTOK_HOST},


hooks/post-receive
-- 
sfcc- Small Footprint CIM Client

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-511-g0b313d3

[Dave H. <hel...@us...>]

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  0b313d3cb801e0864101854742ada8361be38f1a (commit)
      from  c670aaa7544155b6acedb95d60d3421147ab34f8 (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 0b313d3cb801e0864101854742ada8361be38f1a
Author: Dave Heller <hel...@us...>
Date:   Sat Mar 22 11:32:35 2014 -0400

    [sfcb-tix:#105] Add config property embeddedObjectEncoding

-----------------------------------------------------------------------

Summary of changes:
 cimXmlGen.c     |   26 ++++++++++++++++++--------
 control.c       |    2 ++
 sfcBroker.c     |    9 +++++++++
 sfcb.cfg.pre.in |    5 +++++
 4 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/cimXmlGen.c b/cimXmlGen.c
index b2cf79d..8e462b3 100644
--- a/cimXmlGen.c
+++ b/cimXmlGen.c
@@ -611,10 +611,14 @@ value2xml(CMPIData d, UtilStringBuffer * sb, int wv)
         splen = 0;
       }
     } else if (d.type == CMPI_instance) {
-      // SFCB_APPENDCHARS_BLOCK(sb, "<![CDATA[");
-      // instance2xml(d.value.inst, sb, 0);
-      // SFCB_APPENDCHARS_BLOCK(sb, "]]>");
-      add_escaped_instance(sb, d.value.inst);
+      extern int useCDATA;
+      if (useCDATA) {
+        SFCB_APPENDCHARS_BLOCK(sb, "<![CDATA[");
+        instance2xml(d.value.inst, sb, 0);
+        SFCB_APPENDCHARS_BLOCK(sb, "]]>");
+      } else {
+        add_escaped_instance(sb, d.value.inst);
+      }
       splen = 0;
     } else {
       mlogf(M_ERROR, M_SHOW, "%s(%d): invalid value2xml %d-%x\n", __FILE__,
@@ -773,6 +777,7 @@ data2xml(CMPIData *data, CMPIString *name,
       if (embInst == 1) {
         SFCB_APPENDCHARS_BLOCK(sb, "\" EmbeddedObject=\"instance");
       } else {
+        SFCB_APPENDCHARS_BLOCK(sb, "string");
         SFCB_APPENDCHARS_BLOCK(sb, "\" EmbeddedObject=\"object");
       }
     } else {
@@ -836,12 +841,17 @@ data2xml(CMPIData *data, CMPIString *name,
         SFCB_APPENDCHARS_BLOCK(sb, "\" PARAMTYPE=\"string\">\n");
       else
         SFCB_APPENDCHARS_BLOCK(sb, "\" TYPE=\"string\">\n");
+
       if (data->value.inst) {
         SFCB_APPENDCHARS_BLOCK(sb, "<VALUE>");
-        // SFCB_APPENDCHARS_BLOCK(sb, "<![CDATA[");
-        // instance2xml(data->value.inst, sb, 0);
-        // SFCB_APPENDCHARS_BLOCK(sb, "]]>");
-        add_escaped_instance(sb, data->value.inst);
+        extern int useCDATA;
+        if (useCDATA) {
+          SFCB_APPENDCHARS_BLOCK(sb, "<![CDATA[");
+          instance2xml(data->value.inst, sb, 0);
+          SFCB_APPENDCHARS_BLOCK(sb, "]]>");
+        } else {
+          add_escaped_instance(sb, data->value.inst);
+        }
         SFCB_APPENDCHARS_BLOCK(sb, "</VALUE>\n");
       }
     }
diff --git a/control.c b/control.c
index 3239cbf..5c562cf 100644
--- a/control.c
+++ b/control.c
@@ -73,6 +73,7 @@ char           *ip6List= NULL;
 
 char          **origArgv;
 int             origArgc;
+int             useCDATA;
 unsigned int    labelProcs;
 
 /**
@@ -149,6 +150,7 @@ static Control init[] = {
   {"useChunking", CTL_STRING, "true", {0}},
   {"chunkSize", CTL_LONG, NULL, {.slong=50000}},
   {"maxChunkObjCount", CTL_ULONG, NULL, {.ulong=0}},
+  {"embeddedObjEncoding", CTL_STRING, "xmlescape", {0}},
 
   {"trimWhitespace", CTL_BOOL, NULL, {.b=1}},
 
diff --git a/sfcBroker.c b/sfcBroker.c
index 67b1f9e..ca043c9 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -957,6 +957,15 @@ main(int argc, char *argv[])
     trimws = 0;
   }
 
+  char *eoe;
+  extern int useCDATA;
+  if (!getControlChars("embeddedObjEncoding",&eoe) && !strcasecmp(eoe,"CDATA")) {
+    useCDATA = 1;
+    mlogf(M_INFO,M_SHOW,"--- Use CDATA for EmbeddedObject encoding\n");
+  } else {
+    mlogf(M_INFO,M_SHOW,"--- Use XML escaping for EmbeddedObject encoding\n");
+  }
+    
   if ((enableHttp || enableHttps) && dSockets > 0) {
     startHttp = 1;
   }
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index 3f768a6..6affe33 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -144,6 +144,11 @@ basicAuthEntry: _sfcBasicAuthenticate
 ## Default is true
 #trimWhitespace:      true
 
+## Sets the encoding style to be used for returning an EmbeddedObject over
+## CIM-XML. Choices are "CDATA" or "xmlescape"
+## Default is xmlescape
+# embeddedObjEncoding: xmlescape
+
 ##---------------------------- Provider-Related -------------------------------
 
 ## Max number of provider processes.  


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] wbemcli ChangeLog, 1.41, 1.42 CimXml.cpp, 1.75, 1.76 NEWS, 1.48, 1.49

[Dave H. <hel...@us...>]

Update of /cvsroot/sblim/wbemcli
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv7663

Modified Files:
	ChangeLog CimXml.cpp NEWS 
Log Message:
Fixed 0002721: wbemcli does not accept dot in userid:password

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/wbemcli/NEWS,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- NEWS	20 Sep 2013 23:26:33 -0000	1.48
+++ NEWS	4 Mar 2014 06:50:08 -0000	1.49
@@ -9,6 +9,7 @@
 - 0002627 Add -w option to wbemcli
 - 0002665 Add -e100 option to wbemcli
 - 0002629 Do not attempt connect if missing cacert
+- 0002721 wbemcli does not accept dot in userid:password
 
 Changes in Version 1.6.2
 ========================

Index: ChangeLog
===================================================================
RCS file: /cvsroot/sblim/wbemcli/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ChangeLog	20 Sep 2013 23:26:32 -0000	1.41
+++ ChangeLog	4 Mar 2014 06:50:08 -0000	1.42
@@ -1,3 +1,9 @@
+2014-03-04 Dave Heller <hel...@us...>
+
+	* CimXml.cpp, NEWS:
+
+	Fixed 0002721: wbemcli does not accept dot in userid:password
+
 2013-09-20 Dave Heller <hel...@us...>
 
 	* CimCurl.cpp, NEWS:

Index: CimXml.cpp
===================================================================
RCS file: /cvsroot/sblim/wbemcli/CimXml.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- CimXml.cpp	19 Sep 2013 14:34:26 -0000	1.75
+++ CimXml.cpp	4 Mar 2014 06:50:08 -0000	1.76
@@ -2986,9 +2986,9 @@
        u += 7;
    }
    phelp=strchr(u,'@'); // potential auth token delimiter
-   p=strchr(u,'.');     // potential key/host delimiter (doesn't matter)
+   p=NULL;
    b=strchr(u,'[');     // likely an IPv6 host
-   if (phelp && ( p==NULL || p > phelp)) {
+   if (phelp) {
      // contains auth token[s] -- process them
      p=strchr(u,':');
      if (b != NULL && p != NULL && (p < b)) {

[Sblim-commit] jsr48-client NEWS,1.428,1.429

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4656

Modified Files:
	NEWS 
Log Message:
2725 Resolve CIMVERSION/DTDVERSION issues in CIM element

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.428
retrieving revision 1.429
diff -u -d -r1.428 -r1.429
--- NEWS	3 Mar 2014 21:17:53 -0000	1.428
+++ NEWS	3 Mar 2014 21:32:26 -0000	1.429
@@ -2,6 +2,7 @@
 ================
    2720 Add SendIndicationSample
    2724 Listener should verify XML media type
+   2725 Resolve CIMVERSION/DTDVERSION issues in CIM element
 
 Version 2.2.5
 ================

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMXMLParserImpl.java, 1.88, 1.89

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4656/src/org/sblim/cimclient/internal/cimxml

Modified Files:
	CIMXMLParserImpl.java 
Log Message:
2725 Resolve CIMVERSION/DTDVERSION issues in CIM element

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- CIMXMLParserImpl.java	12 Dec 2013 15:19:01 -0000	1.88
+++ CIMXMLParserImpl.java	3 Mar 2014 21:32:25 -0000	1.89
@@ -1,7 +1,7 @@
 /**
  * CIMXMLParserImpl.java
  *
- * (C) Copyright IBM Corp. 2005, 2013
+ * (C) Copyright IBM Corp. 2005, 2014
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -94,6 +94,7 @@
  *    2713    2013-11-22  blaschke-oss Enforce loose validation of CIM-XML documents
  *    2715    2013-11-26  blaschke-oss Add VALUE.NULL support
  *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
+ *    2725    2014-02-18  blaschke-oss Resolve CIMVERSION/DTDVERSION issues in CIM element
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -2381,8 +2382,8 @@
 		Attr protocolA = (Attr) searchAttribute(pMessageE, "PROTOCOLVERSION");
 		if (protocolA == null) throw new CIMXMLParseException(
 				"MESSAGE element missing PROTOCOLVERSION attribute!");
-		// TODO
-		if (pCimVersion.equals("2.0") && pDtdVersion.equals("2.0")) {
+
+		if (pCimVersion.startsWith("2.") && pDtdVersion.startsWith("2.")) {
 
 			// Attr message_idA = (Attr)searchAttribute(messageE, "ID");
 			// String messadeID = message_idA.getNodeValue();
@@ -2459,8 +2460,7 @@
 			}
 			throw new CIMXMLParseException("MESSAGE element missing required child element!");
 		}
-		// TODO, look for the specific error message in the spec
-		throw new CIMXMLParseException("DTD not supported");
+		throw new CIMXMLParseException("Unsupported CIMVERSION/DTDVERSION");
 	}
 
 	private static final String nodesPARAMVALUE[] = { "VALUE", "VALUE.REFERENCE", "VALUE.ARRAY",

[Sblim-commit] jsr48-client NEWS,1.427,1.428

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3796

Modified Files:
	NEWS 
Log Message:
2724 Listener should verify XML media type

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.427
retrieving revision 1.428
diff -u -d -r1.427 -r1.428
--- NEWS	24 Feb 2014 16:55:53 -0000	1.427
+++ NEWS	3 Mar 2014 21:17:53 -0000	1.428
@@ -1,6 +1,7 @@
 Changes in HEAD
 ================
    2720 Add SendIndicationSample
+   2724 Listener should verify XML media type
 
 Version 2.2.5
 ================

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-510-gc670aaa

[Dave H. <hel...@us...>]

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  c670aaa7544155b6acedb95d60d3421147ab34f8 (commit)
      from  e984e37fed5a7930344af3401676a3e1d80bdb1d (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 c670aaa7544155b6acedb95d60d3421147ab34f8
Author: Dave Heller <hel...@us...>
Date:   Thu Feb 27 10:07:00 2014 -0500

    [sfcb-tix:#103] Unsafe usage of strncpy in providerRegister.c

-----------------------------------------------------------------------

Summary of changes:
 contributions.txt  |    4 ++++
 providerRegister.c |    3 ++-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/contributions.txt b/contributions.txt
index f72a5ac..f8d2f81 100644
--- a/contributions.txt
+++ b/contributions.txt
@@ -248,3 +248,7 @@ Ting Wang
 Vitezslav Crhonek, Red Hat
 ----------
 02/07/2014 [sfcb-tix:#98] sfcbmofpp segfaults if mof file ends with block comment without newline
+
+dcb314
+----------
+02/27/2014 [sfcb-tix:#103] Unsafe usage of strncpy in providerRegister.c
diff --git a/providerRegister.c b/providerRegister.c
index 78d0f7b..7632fdd 100644
--- a/providerRegister.c
+++ b/providerRegister.c
@@ -34,6 +34,7 @@
 static ProviderInfo forceNotFound = { "", FORCE_PROVIDER_NOTFOUND };
 extern unsigned long exFlags;
 extern char    *configfile;
+extern char    *strncpy_kind(char *to, char *from, size_t size);
 extern int      setupControl(char *fn);
 extern int      getControlChars(char *id, char **val);
 extern int      getControlBool(char *id, int *val);
@@ -191,7 +192,7 @@ newProviderRegister()
     dir = "/var/lib/sfcb/registration";
   }
 
-  strncpy(fin, dir, sizeof(fin)-18); /* 18 = strlen("/providerRegister")+1 */
+  strncpy_kind(fin, dir, sizeof(fin)-18); /* 18 = strlen("/providerRegister")+1 */
   strcat(fin, "/providerRegister");
   in = fopen(fin, "r");
   if (in == NULL)


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client build.xml,1.48,1.49 NEWS,1.426,1.427

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12348

Modified Files:
	build.xml NEWS 
Log Message:
2720 Add SendIndicationSample

Index: NEWS
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/NEWS,v
retrieving revision 1.426
retrieving revision 1.427
diff -u -d -r1.426 -r1.427
--- NEWS	13 Dec 2013 10:47:29 -0000	1.426
+++ NEWS	24 Feb 2014 16:55:53 -0000	1.427
@@ -1,3 +1,7 @@
+Changes in HEAD
+================
+   2720 Add SendIndicationSample
+
 Version 2.2.5
 ================
    2717 Update detailed release history HTML for 2.2.5

Index: build.xml
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/build.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- build.xml	6 Feb 2013 13:05:46 -0000	1.48
+++ build.xml	24 Feb 2014 16:55:53 -0000	1.49
@@ -1,7 +1,7 @@
 <!--
   build.xml
  
-  (C) Copyright IBM Corp. 2005, 2013
+  (C) Copyright IBM Corp. 2005, 2014
  
   THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
   ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -32,10 +32,10 @@
     <!-- set global properties for this build -->
     <property environment="env" />
 
-    <property name="Base.copyright" value="Copyright (C) IBM Corp. 2005, 2013" />
+    <property name="Base.copyright" value="Copyright (C) IBM Corp. 2005, 2014" />
     <property name="Manifest.name" value="SBLIM CIM Client for Java" />
     <property name="Manifest.title" value="SBLIM CIM Client for Java" />
-    <property name="Manifest.vendor" value="IBM Corporation 2005, 2013" />
+    <property name="Manifest.vendor" value="IBM Corporation 2005, 2014" />
     <property name="Manifest.version" value="HEAD" />
 
     <property name="Directory.source.core" value="${basedir}/src" />
@@ -207,7 +207,7 @@
                  packages="org.sblim.cimclient.internal*:org.sblim.slp.internal*"/>
             <link href="http://download.oracle.com/javase/1.5.0/docs/api/"/>
             <doctitle><![CDATA[<h1>SBLIM CIM Client for Java - ${Manifest.version} - Public API Specification</h1>]]></doctitle>
-            <bottom><![CDATA[<i>Copyright &#169; 2005, 2013 IBM Corporation. All Rights Reserved.</i>]]></bottom>
+            <bottom><![CDATA[<i>Copyright &#169; 2005, 2014 IBM Corporation. All Rights Reserved.</i>]]></bottom>
         </javadoc>
     </target>
 

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-509-ge984e37

[Dave H. <hel...@us...>]

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  e984e37fed5a7930344af3401676a3e1d80bdb1d (commit)
      from  bd3cc9b7cb9a5cda53ac2ff67ef336cd500a7bc0 (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 e984e37fed5a7930344af3401676a3e1d80bdb1d
Author: Dave Heller <hel...@us...>
Date:   Thu Feb 20 20:38:27 2014 -0500

    [sfcb-tix:#102] Add config property indicationCurlHonorRedirect

-----------------------------------------------------------------------

Summary of changes:
 control.c         |    1 +
 indCIMXMLExport.c |   11 ++++++++++-
 sfcb.cfg.pre.in   |   10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletions(-)

diff --git a/control.c b/control.c
index 86c17cb..3239cbf 100644
--- a/control.c
+++ b/control.c
@@ -201,6 +201,7 @@ static Control init[] = {
   {"MaxActiveSubscriptions", CTL_LONG, NULL, {.slong=100}},
   {"indicationCurlTimeout", CTL_LONG, NULL, {.slong=10}},
   {"indicationCurlUseExpect100", CTL_BOOL, NULL, {.b=0}},
+  {"indicationCurlHonorRedirect", CTL_BOOL, NULL, {.b=0}},
 };
 
 static Control *cache;
diff --git a/indCIMXMLExport.c b/indCIMXMLExport.c
index eaa5733..60a420b 100644
--- a/indCIMXMLExport.c
+++ b/indCIMXMLExport.c
@@ -238,6 +238,16 @@ genRequest(CurlData * cd, char *url, char **msg)
         indicationCurlTimeout = 10;
   rv = curl_easy_setopt(cd->mHandle, CURLOPT_TIMEOUT, indicationCurlTimeout);
 
+  /* Honor a HTTP 3xx style redirect */
+  int opt;
+  if (!getControlBool("indicationCurlHonorRedirect", &opt) && opt) {
+    fprintf(stderr, "--> indCIMXMLExport.genRequest(): indicationCurlHonorRedirect = true\n");
+    rv = curl_easy_setopt(cd->mHandle, CURLOPT_FOLLOWLOCATION, 1);
+    rv = curl_easy_setopt(cd->mHandle, CURLOPT_UNRESTRICTED_AUTH, 0); // off for now
+    rv = curl_easy_setopt(cd->mHandle, CURLOPT_MAXREDIRS, 3); // prevent loop
+    rv = curl_easy_setopt(cd->mHandle, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
+  }
+
   /*
    * Set username and password * / if (url.user.length() > 0 &&
    * url.password.length() > 0) { mUserPass = url.user + ":" +
@@ -249,7 +259,6 @@ genRequest(CurlData * cd, char *url, char **msg)
   initializeHeaders(cd);
 
   /* Curl does Expect:100-continue unless we tell it not to */
-  int opt;
   if (getControlBool("indicationCurlUseExpect100", &opt) || !opt)
     cd->mHeaders = curl_slist_append(cd->mHeaders, "Expect: ");
 
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index 31e101d..3f768a6 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -376,6 +376,16 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
 ## Default is false
 #indicationCurlUseExpect100: false
 
+## If true, instruct curl to honor a HTTP 3xx redirect if it receives such a
+## response from the indication handler, and attempt delivery to the URI listed
+## in the HTTP Location header of the response. This allows handler to redirect
+## indications to a different handler, e.g. based on source IP or resource part
+## of the URI. Because this introduces a potential security vulnerability it is
+## recommended to use only secure (https) indications and to set the
+## sslIndicationReceiverCert property to 'verify' when this is enabled.
+## Default is false
+#indicationCurlHonorRedirect: false
+
 ##----------------------------Reliable Indications ----------------------------
 ## Interval between indication retry attempts
 ## Default is 20 seconds


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-508-gbd3cc9b

[Dave H. <hel...@us...>]

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  bd3cc9b7cb9a5cda53ac2ff67ef336cd500a7bc0 (commit)
      from  c29c15e5d73d70bf547c71167f9816e54897718a (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 bd3cc9b7cb9a5cda53ac2ff67ef336cd500a7bc0
Author: Dave Heller <hel...@us...>
Date:   Thu Feb 20 20:31:20 2014 -0500

    [sfcb-tix:#101] Add config property indicationCurlUseExpect100

-----------------------------------------------------------------------

Summary of changes:
 control.c         |    1 +
 indCIMXMLExport.c |    5 +++++
 sfcb.cfg.pre.in   |   15 +++++++++++++++
 3 files changed, 21 insertions(+), 0 deletions(-)

diff --git a/control.c b/control.c
index 833e3bb..86c17cb 100644
--- a/control.c
+++ b/control.c
@@ -200,6 +200,7 @@ static Control init[] = {
   {"MaxListenerDestinations", CTL_LONG, NULL, {.slong=100}},
   {"MaxActiveSubscriptions", CTL_LONG, NULL, {.slong=100}},
   {"indicationCurlTimeout", CTL_LONG, NULL, {.slong=10}},
+  {"indicationCurlUseExpect100", CTL_BOOL, NULL, {.b=0}},
 };
 
 static Control *cache;
diff --git a/indCIMXMLExport.c b/indCIMXMLExport.c
index 6b4184c..eaa5733 100644
--- a/indCIMXMLExport.c
+++ b/indCIMXMLExport.c
@@ -248,6 +248,11 @@ genRequest(CurlData * cd, char *url, char **msg)
   // Initialize default headers
   initializeHeaders(cd);
 
+  /* Curl does Expect:100-continue unless we tell it not to */
+  int opt;
+  if (getControlBool("indicationCurlUseExpect100", &opt) || !opt)
+    cd->mHeaders = curl_slist_append(cd->mHeaders, "Expect: ");
+
   // Set all of the headers for the request
   rv = curl_easy_setopt(cd->mHandle, CURLOPT_HTTPHEADER, cd->mHeaders);
 
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index ef158eb..31e101d 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -361,6 +361,21 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
 ## Default is 10 seconds
 #indicationCurlTimeout: 10
 
+## If true, instruct curl to use HTTP/1.1 Expect:100-continue behavior when
+## delivering indications. This means that curl will send the header and wait
+## up to 1s for a 100-continue reply (or other response code) before sending
+## the indication payload. This can in limited circumstances save network
+## bandwidth, etc. by allowing the destination handler to refuse delivery and
+## potentially redirect the indication to a different handler, before curl
+## delivers the payload.  Otherwise the payload is delivered as normal, once
+## the handler sends the 100-continue or the 1s timeout expires. Note that if
+## the destination is not coded to handle HTTP/1.1 Expect:100-continue, this
+## will cause an unnecessary 1s delay in delivering each indication. For that
+## reason it recommnded to leave this off unless you understand your handlers'
+## behavior in this regard. May be useful with indicationCurlHonorRedirect.
+## Default is false
+#indicationCurlUseExpect100: false
+
 ##----------------------------Reliable Indications ----------------------------
 ## Interval between indication retry attempts
 ## Default is 20 seconds


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-507-gc29c15e

[Dave H. <hel...@us...>]

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  c29c15e5d73d70bf547c71167f9816e54897718a (commit)
      from  5ffd5df6a61d3553718580004d130aae7deb9799 (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 c29c15e5d73d70bf547c71167f9816e54897718a
Author: Dave Heller <hel...@us...>
Date:   Wed Feb 19 18:47:31 2014 -0500

    [sfcb-tix:#100] Fix some compiler warnings & errors on newer distros

-----------------------------------------------------------------------

Summary of changes:
 cimXmlOps.y                          |    7 ++++---
 cimXmlParser.c                       |    6 +++++-
 indCIMXMLHandler.c                   |    6 +++---
 objectImpl.c                         |    4 ++--
 queryLexer.l                         |    2 +-
 sfcBroker.c                          |    2 +-
 sfcbproc.c                           |    2 +-
 sfcbtrace.c                          |    2 +-
 test/TestProviders/tests/Makefile.am |    2 +-
 9 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/cimXmlOps.y b/cimXmlOps.y
index fd62e4d..41b4e93 100644
--- a/cimXmlOps.y
+++ b/cimXmlOps.y
@@ -72,7 +72,7 @@ extern int      noChunking;
 
 
 
-extern int yyerror(const char*);
+extern int yyerror(void* parm, const char*);
 extern int yylex (void *lvalp, ParserControl *parm);
 //extern MsgSegment setInstanceMsgSegment(const CMPIInstance *ci);
 
@@ -1797,6 +1797,7 @@ buildEnumerationCountRequest(void *parm)
 %}
 
 %pure_parser
+%parse-param { void* parm }
 
 /*
 **==============================================================================
@@ -3300,7 +3301,7 @@ modifyInstance
        $$.properties=0;
 
        setRequest(parm,&$$,sizeof(XtokModifyInstance),OPS_ModifyInstance);
-       if (buildModifyInstanceRequest(parm)) yyerror("Invalid Parameter");
+       if (buildModifyInstanceRequest(parm)) yyerror(parm, "Invalid Parameter");
     }
     | localNameSpacePath modifyInstanceParmsList
     {
@@ -3314,7 +3315,7 @@ modifyInstance
        $$.properties=$2.properties;
 
        setRequest(parm,&$$,sizeof(XtokModifyInstance),OPS_ModifyInstance);
-       if (buildModifyInstanceRequest(parm)) yyerror("Invalid Parameter");
+       if (buildModifyInstanceRequest(parm)) yyerror(parm, "Invalid Parameter");
     }
 ;
 
diff --git a/cimXmlParser.c b/cimXmlParser.c
index 7614c05..0f8f51d 100644
--- a/cimXmlParser.c
+++ b/cimXmlParser.c
@@ -1696,8 +1696,12 @@ yylex(YYSTYPE * lvalp, ParserControl * parm)
   _SFCB_RETURN(0);
 }
 
+/*
+ * The bison %parse-param directive modifies the yyerror() signature as well as
+ * yyparse(), so we must handle the extra parm even though we don't use it.
+ */
 int
-yyerror(char *s)
+yyerror(void __attribute__ ((unused)) *parm, char *s)
 {
   printf("*-* yyerror: %s\n", s);
   return 5;
diff --git a/indCIMXMLHandler.c b/indCIMXMLHandler.c
index be7be71..eb566a2 100644
--- a/indCIMXMLHandler.c
+++ b/indCIMXMLHandler.c
@@ -737,8 +737,8 @@ retryExport(void *lctx)
   struct timezone tz;
   int             rint,
                   maxcount,
-                  ract,
-                  rtint;
+                  ract;
+  CMPIUint32      rtint;
   CMPIUint64      sfc = 0;
   CMPIObjectPath *op;
   CMPIEnumeration *isenm = NULL;
@@ -834,7 +834,7 @@ retryExport(void *lctx)
           CMSetProperty(sub, "DeliveryFailureTime", &sfc, CMPI_uint64);
           CBModifyInstance(_broker, ctxLocal, cur->sub, sub, NULL);
           cur = cur->next;
-        } else if (sfc + rtint < tv.tv_sec) {
+        } else if (sfc + rtint < (CMPIUint64) tv.tv_sec) {
           // Exceeded subscription removal threshold, if action is:
           // 2, delete the sub; 3, disable the sub; otherwise, nothing
           if (ract == 2) {
diff --git a/objectImpl.c b/objectImpl.c
index 8df8087..e9c889c 100644
--- a/objectImpl.c
+++ b/objectImpl.c
@@ -3064,7 +3064,7 @@ oi_test()
     printf("Failed isInstance check, rc=%d\n",i);
     fail = 1;
   }
-  i=isInstance(cop);
+  i=isInstance((CMPIInstance *)cop);
   if (i) {
     printf("Failed negative isInstance check, rc=%d\n",i);
     fail = 1;
@@ -3178,7 +3178,7 @@ oi_test()
     printf("Failed to create ClClass.\n");
     fail = 1;
   }
-  unsigned char cch=ClClassAddGrandParent(clc, "myGClass");
+  //unsigned char cch=ClClassAddGrandParent(clc, "myGClass");
   // not sure of the failure case here
 
   i=ClClassAddProperty(clc,"tprop" ,d,"testref");
diff --git a/queryLexer.l b/queryLexer.l
index ce9afe7..49932d0 100644
--- a/queryLexer.l
+++ b/queryLexer.l
@@ -52,7 +52,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 
-extern int queryInput(char* buffer, int* numRead, int numRequested);
+extern int queryInput(char* buffer, void* numRead, int numRequested);
 extern int yyErr(const char*);
 extern char * yyStrcpy(char *txt, int len);
 
diff --git a/sfcBroker.c b/sfcBroker.c
index a71dc32..67b1f9e 100644
--- a/sfcBroker.c
+++ b/sfcBroker.c
@@ -807,7 +807,7 @@ main(int argc, char *argv[])
 
       /* Create a pad argument of appropriate length */
       char *padArg = malloc(labelProcs + 1);
-      for (i=0; i < labelProcs; i++)
+      for (i=0; i < (int)labelProcs; i++)
         padArg[i] = 'X';
       padArg[i] = '\0';
 
diff --git a/sfcbproc.c b/sfcbproc.c
index dfcde72..ed4d76a 100644
--- a/sfcbproc.c
+++ b/sfcbproc.c
@@ -522,7 +522,7 @@ static void usage(int status) {
     int i;
 
     fprintf(stdout, "Usage: %s [options]\n", name);
-    for (i=0; i < sizeof(help) / sizeof(char*); i++)
+    for (i=0; i < (int) (sizeof(help) / sizeof(char*)); i++)
       fprintf(stdout, "%s\n", help[i]);
   }
   exit(status);
diff --git a/sfcbtrace.c b/sfcbtrace.c
index 83e28d9..09985f9 100644
--- a/sfcbtrace.c
+++ b/sfcbtrace.c
@@ -85,7 +85,7 @@ int main(int argc, char **argv) {
 
   vpDP = shmat( shmid, NULL, 0 );
   if ( (vpDP == (void*)-1) || (vpDP == NULL) ) {  /* shmat returns an error */
-    printf( "shmat(%x,) returned %08X with errno = %s(%u) in %s at line %d\n", shmid, (unsigned int)vpDP, strerror(errno), errno, __FILE__, __LINE__ );
+    printf( "shmat(%x,) returned %p with errno = %s(%u) in %s at line %d\n", shmid, vpDP, strerror(errno), errno, __FILE__, __LINE__ );
     exit(4);
   }
 
diff --git a/test/TestProviders/tests/Makefile.am b/test/TestProviders/tests/Makefile.am
index 6510b62..2765a16 100644
--- a/test/TestProviders/tests/Makefile.am
+++ b/test/TestProviders/tests/Makefile.am
@@ -32,4 +32,4 @@ endif
 
 #Some wbemcat tests
 export SRCDIR=$(srcdir)
-TESTS = $(srcdir)/xmltest.sh $(srcdir)/IndRetryTest.sh $(srcdir)/limitTest.sh
+TESTS = xmltest.sh IndRetryTest.sh limitTest.sh


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node CIMNode.java, 1.1.2.10, 1.1.2.11

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6996/src/org/sblim/cimclient/internal/cimxml/sax/node

Modified Files:
      Tag: Experimental
	CIMNode.java 
Log Message:
2725 Resolve CIMVERSION/DTDVERSION issues in CIM element

Index: CIMNode.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/sax/node/CIMNode.java,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -d -r1.1.2.10 -r1.1.2.11
--- CIMNode.java	12 Nov 2013 19:39:33 -0000	1.1.2.10
+++ CIMNode.java	18 Feb 2014 20:34:05 -0000	1.1.2.11
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2006, 2013
+ * (C) Copyright IBM Corp. 2006, 2014
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -21,6 +21,7 @@
  * 3511454    2012-03-27  blaschke-oss SAX nodes not reinitialized properly
  *    2604    2013-07-01  blaschke-oss SAXException messages should contain node name
  *    2708    2013-11-12  blaschke-oss CIMNode quietly ignores DECLARATION child
+ *    2725    2014-02-18  blaschke-oss Resolve CIMVERSION/DTDVERSION issues in CIM element
  */
 
 package org.sblim.cimclient.internal.cimxml.sax.node;
@@ -65,6 +66,8 @@
 		this.iDtdVersion = pAttribs.getValue("DTDVERSION");
 		if (this.iDtdVersion == null) { throw new SAXException(
 				"DTDVERSION attribute is mandatory for " + getNodeName() + " node!"); }
+		if (!this.iCimVersion.startsWith("2.") || !this.iDtdVersion.startsWith("2.")) { throw new SAXException(
+				"Unsupported CIMVERSION/DTDVERSION attribute in " + getNodeName() + " node!"); }
 		this.iContent = null;
 	}
 

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/cimxml CIMXMLParserImpl.java, 1.14.2.80, 1.14.2.81

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6996/src/org/sblim/cimclient/internal/cimxml

Modified Files:
      Tag: Experimental
	CIMXMLParserImpl.java 
Log Message:
2725 Resolve CIMVERSION/DTDVERSION issues in CIM element

Index: CIMXMLParserImpl.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/cimxml/CIMXMLParserImpl.java,v
retrieving revision 1.14.2.80
retrieving revision 1.14.2.81
diff -u -d -r1.14.2.80 -r1.14.2.81
--- CIMXMLParserImpl.java	29 Nov 2013 13:50:14 -0000	1.14.2.80
+++ CIMXMLParserImpl.java	18 Feb 2014 20:34:05 -0000	1.14.2.81
@@ -1,7 +1,7 @@
 /**
  * CIMXMLParserImpl.java
  *
- * (C) Copyright IBM Corp. 2005, 2013
+ * (C) Copyright IBM Corp. 2005, 2014
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -94,6 +94,7 @@
  *    2713    2013-11-22  blaschke-oss Enforce loose validation of CIM-XML documents
  *    2715    2013-11-26  blaschke-oss Add VALUE.NULL support
  *    2538    2013-11-28  blaschke-oss CR14: Support new CORRELATOR element
+ *    2725    2014-02-18  blaschke-oss Resolve CIMVERSION/DTDVERSION issues in CIM element
  */
 
 package org.sblim.cimclient.internal.cimxml;
@@ -2382,8 +2383,8 @@
 		Attr protocolA = (Attr) searchAttribute(pMessageE, "PROTOCOLVERSION");
 		if (protocolA == null) throw new CIMXMLParseException(
 				"MESSAGE element missing PROTOCOLVERSION attribute!");
-		// TODO
-		if (pCimVersion.equals("2.0") && pDtdVersion.equals("2.0")) {
+
+		if (pCimVersion.startsWith("2.") && pDtdVersion.startsWith("2.")) {
 
 			// Attr message_idA = (Attr)searchAttribute(messageE, "ID");
 			// String messadeID = message_idA.getNodeValue();
@@ -2460,8 +2461,7 @@
 			}
 			throw new CIMXMLParseException("MESSAGE element missing required child element!");
 		}
-		// TODO, look for the specific error message in the spec
-		throw new CIMXMLParseException("DTD not supported");
+		throw new CIMXMLParseException("Unsupported CIMVERSION/DTDVERSION");
 	}
 
 	private static final String nodesPARAMVALUE[] = { "VALUE", "VALUE.REFERENCE", "VALUE.ARRAY",

[Sblim-commit] jsr48-client/src/org/sblim/cimclient/internal/wbem/indications CIMIndicationHandler.java, 1.10.2.27, 1.10.2.28

[Dave B. <bla...@us...>]

Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv20677/src/org/sblim/cimclient/internal/wbem/indications

Modified Files:
      Tag: Experimental
	CIMIndicationHandler.java 
Log Message:
2724 Listener should verify XML media type

Index: CIMIndicationHandler.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/indications/CIMIndicationHandler.java,v
retrieving revision 1.10.2.27
retrieving revision 1.10.2.28
diff -u -d -r1.10.2.27 -r1.10.2.28
--- CIMIndicationHandler.java	23 Jan 2013 20:53:46 -0000	1.10.2.27
+++ CIMIndicationHandler.java	18 Feb 2014 17:02:25 -0000	1.10.2.28
@@ -1,5 +1,5 @@
 /**
- * (C) Copyright IBM Corp. 2005, 2013
+ * (C) Copyright IBM Corp. 2005, 2014
  *
  * THIS FILE IS PROVIDED UNDER THE TERMS OF THE ECLIPSE PUBLIC LICENSE 
  * ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THIS FILE 
@@ -44,6 +44,7 @@
  * 3553858    2012-08-06  blaschke-oss Append duplicate HTTP header fields instead of replace
  * 3554738    2012-08-16  blaschke-oss dump CIM xml by LogAndTraceBroker.trace()
  * 3601894    2013-01-23  blaschke-oss Enhance HTTP and CIM-XML tracing
+ *    2724    2014-02-18  blaschke-oss Listener should verify XML media type
  */
 
 package org.sblim.cimclient.internal.wbem.indications;
@@ -453,9 +454,21 @@
 			throws HttpException {
 
 		HttpHeader header = processHttpExtensions(pHeader);
+		String contentType = header.getField("Content-Type");
 		String cimExport = header.getField("CIMExport");
 		String cimOperation = header.getField("CIMOperation");
 
+		if (contentType == null) {
+			pWriter.getHeader().addField("CIMError", "request-not-valid");
+			throw new HttpException(415, "Unsupported Media Type");
+		}
+
+		contentType = contentType.toLowerCase();
+		if (!contentType.contains("application/xml") && !contentType.contains("text/xml")) {
+			pWriter.getHeader().addField("CIMError", "request-not-valid");
+			throw new HttpException(415, "Unsupported Media Type");
+		}
+
 		if (cimOperation != null && !"METHODCALL".equalsIgnoreCase(cimOperation)) {
 			pWriter.getHeader().addField("CIMError", "unsupported-operation");
 			throw new HttpException(400, "Bad Request");

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master, updated. SFCB_1_4_0-506-g5ffd5df

[Dave H. <hel...@us...>]

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  5ffd5df6a61d3553718580004d130aae7deb9799 (commit)
      from  1f5ff60b4091c88868b0af39a980968d47784429 (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 5ffd5df6a61d3553718580004d130aae7deb9799
Author: Dave Heller <hel...@us...>
Date:   Tue Feb 11 10:40:00 2014 -0500

    [sfcb-tix:#99] Add config property enableSslCipherServerPref

-----------------------------------------------------------------------

Summary of changes:
 control.c       |    1 +
 httpAdapter.c   |   16 ++++++++++++----
 sfcb.cfg.pre.in |    6 ++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/control.c b/control.c
index 1f789ff..833e3bb 100644
--- a/control.c
+++ b/control.c
@@ -169,6 +169,7 @@ static Control init[] = {
   {"sslCiphers", CTL_STRING, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH", {0}},
   {"sslDhParamsFilePath", CTL_STRING, NULL, {0}},
   {"sslEcDhCurveName", CTL_STRING, "secp224r1", {0}},
+  {"enableSslCipherServerPref", CTL_BOOL, NULL, {.b=0}},
 
   {"registrationDir", CTL_STRING, SFCB_STATEDIR "/registration", {0}},
   {"providerDirs", CTL_USTRING, SFCB_LIBDIR " " CMPI_LIBDIR " " LIBDIR, {0}},
diff --git a/httpAdapter.c b/httpAdapter.c
index f374c08..df6e596 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -2037,7 +2037,8 @@ initSSL()
                  *fcert,
                  *fdhp,
                  *sslCiphers;
-  int             rc;
+  int             rc,
+                  escsp;
 
   if (ctx)
     SSL_CTX_free(ctx);
@@ -2083,10 +2084,17 @@ initSSL()
   }
 
   /*
-   * SSLv2 is pretty old; no one should be needing it any more 
+   * Set options
    */
-  SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 |
-                      SSL_OP_SINGLE_DH_USE);
+  SSL_CTX_set_options(ctx, SSL_OP_ALL | 
+                           SSL_OP_NO_SSLv2 |
+                           SSL_OP_SINGLE_DH_USE);
+
+  if (!getControlBool("enableSslCipherServerPref", &escsp) && escsp) {
+    _SFCB_TRACE(1, ("---  enableSslCipherServerPref = true"));
+    SSL_CTX_set_options(ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
+  }
+
   /*
    * Set valid ciphers
    */
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index d575a7e..ef158eb 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -291,6 +291,12 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
 ## Default is secp224r1
 #sslEcDhCurveName: secp224r1
 
+## When set to true, sets the SSL_OP_CIPHER_SERVER_PREFERENCE flag for the ssl
+## context, to enforce server's preference instead of the client preference for
+## selection of cipher suite. See man SSL_CTX_set_options(3) for details.
+## Default is false
+#enableSslCipherServerPref: false
+
 ##---------------------------------- UDS --------------------------------------
 ## These options only apply if configured with --enable-uds
 


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker

[Sblim-commit] Git: sfcb - Small Footprint CIM Broker branch, master_1.3, updated. fab104b9b6b2aeeac5d8a0bdf0179f9aa6857493

[Dave H. <hel...@us...>]

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_1.3 has been updated
       via  fab104b9b6b2aeeac5d8a0bdf0179f9aa6857493 (commit)
      from  a85824d2959084180b1086d4039124b15ed393c9 (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 fab104b9b6b2aeeac5d8a0bdf0179f9aa6857493
Author: Dave Heller <hel...@us...>
Date:   Tue Feb 11 01:49:15 2014 -0500

    [sfcb-tix:#99] Add config property enableSslCipherServerPref

-----------------------------------------------------------------------

Summary of changes:
 control.c       |    1 +
 httpAdapter.c   |   16 ++++++++++++----
 sfcb.cfg.pre.in |    6 ++++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/control.c b/control.c
index d7d833a..830ff57 100644
--- a/control.c
+++ b/control.c
@@ -111,6 +111,7 @@ static Control init[] = {
    {"sslCiphers", 0, "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"},
    {"sslDhParamsFilePath", 0, NULL},
    {"sslEcDhCurveName", 0, "secp224r1"},
+   {"enableSslCipherServerPref", 2, "false"},
 
    {"registrationDir", 0, SFCB_STATEDIR "/registration"},
    {"providerDirs", 3, SFCB_LIBDIR " " CMPI_LIBDIR " " LIBDIR}, /* 3: unstripped */
diff --git a/httpAdapter.c b/httpAdapter.c
index 5c02237..2d1569e 100644
--- a/httpAdapter.c
+++ b/httpAdapter.c
@@ -1702,7 +1702,8 @@ initSSL()
                  *fnl,
                  *fdhp,
                  *sslCiphers;
-  int             rc;
+  int             rc,
+                  escsp;
 
   if (ctx)
     SSL_CTX_free(ctx);
@@ -1746,10 +1747,17 @@ initSSL()
   }
 
   /*
-   * SSLv2 is pretty old; no one should be needing it any more 
+   * Set options 
    */
-  SSL_CTX_set_options(ctx, SSL_OP_ALL | SSL_OP_NO_SSLv2 |
-                      SSL_OP_SINGLE_DH_USE);
+  SSL_CTX_set_options(ctx, SSL_OP_ALL | 
+                           SSL_OP_NO_SSLv2 |
+                           SSL_OP_SINGLE_DH_USE);
+
+  if (!getControlBool("enableSslCipherServerPref", &escsp) && escsp) {
+    _SFCB_TRACE(1, ("---  enableSslCipherServerPref = true"));
+    SSL_CTX_set_options(ctx, SSL_OP_CIPHER_SERVER_PREFERENCE);
+  }
+
   /*
    * Set valid ciphers
    */
diff --git a/sfcb.cfg.pre.in b/sfcb.cfg.pre.in
index 457ffd7..2f78beb 100644
--- a/sfcb.cfg.pre.in
+++ b/sfcb.cfg.pre.in
@@ -228,6 +228,12 @@ sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH
 ## Default is secp224r1
 #sslEcDhCurveName: secp224r1
 
+## When set to true, sets the SSL_OP_CIPHER_SERVER_PREFERENCE flag for the ssl
+## context, to enforce server's preference instead of the client preference for
+## selection of cipher suite. See man SSL_CTX_set_options(3) for details.
+## Default is false
+#enableSslCipherServerPref: false
+
 ##---------------------------------- UDS --------------------------------------
 ## These options only apply if configured with --enable-uds
 


hooks/post-receive
-- 
sfcb - Small Footprint CIM Broker