diff -Nru sblim-sfcb-1.4.6/args.c sblim-sfcb-1.4.8/args.c --- sblim-sfcb-1.4.6/args.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/args.c 2014-03-26 23:46:27.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: args.c,v 1.13 2007/10/31 15:09:45 sschuetz Exp $ + * $Id: args.c c89835c on Tue Jan 15 16:20:24 2013 -0500 by buccella $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/array.c sblim-sfcb-1.4.8/array.c --- sblim-sfcb-1.4.6/array.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/array.c 2014-03-26 23:46:27.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: array.c,v 1.21 2008/04/14 18:42:34 gdread Exp $ + * $Id: array.c d9e00c3 on Mon Mar 1 10:40:16 2010 -0500 by Sean Swehla $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/brokerUpc.c sblim-sfcb-1.4.8/brokerUpc.c --- sblim-sfcb-1.4.6/brokerUpc.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/brokerUpc.c 2014-03-26 23:46:27.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: brokerUpc.c,v 1.31 2009/11/09 21:49:11 buccella Exp $ + * $Id: brokerUpc.c 62474f7 on Fri Oct 18 15:42:56 2013 -0400 by buccella $ * * © Copyright IBM Corp. 2005, 2007 * @@ -67,10 +67,18 @@ static CMPI_MUTEX_TYPE mtx = NULL; void +freeUpCallMtx() +{ + free(mtx); +} + +void lockUpCall(const CMPIBroker * mb) { - if (mtx == NULL) + if (mtx == NULL) { mtx = mb->xft->newMutex(0); + atexit(freeUpCallMtx); + } mb->xft->lockMutex(mtx); } diff -Nru sblim-sfcb-1.4.6/cimcClientSfcbLocal.c sblim-sfcb-1.4.8/cimcClientSfcbLocal.c --- sblim-sfcb-1.4.6/cimcClientSfcbLocal.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/cimcClientSfcbLocal.c 2014-03-26 23:46:28.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: cimcClientSfcbLocal.c,v 1.32 2009/09/01 18:59:06 buccella Exp $ + * $Id: cimcClientSfcbLocal.c 745f4b0 on Fri Oct 18 16:15:59 2013 -0400 by buccella $ * * © Copyright IBM Corp. 2006, 2007 * @@ -168,6 +168,7 @@ return NULL; } +/* releases the Client created in CMPIConnect2() */ static CMPIStatus releaseClient(Client * mb) { @@ -2089,6 +2090,23 @@ _SFCB_TRACE_STOP(); } +void * +newIndicationListener(ClientEnv *ce, int sslMode, int *portNumber, char **socketName, + void (*fp) (CMPIInstance *indInstance), CMPIStatus* rc) +{ + fprintf(stderr, "*** newIndicationListener not supported for SfcbLocal\n"); + return NULL; +} + +void * _markHeap() { + return markHeap(); +} + +void _releaseHeap(void* heap) { + releaseHeap(heap); + return; +} + /* called by SFCC's NewCIMCEnv() */ ClientEnv * _Create_SfcbLocal_Env(char __attribute__ ((unused)) *id, unsigned int options, @@ -2108,6 +2126,9 @@ newDateTime, newDateTimeFromBinary, newDateTimeFromChars, + newIndicationListener, + _markHeap, + _releaseHeap }; // localClientMode=1; diff -Nru sblim-sfcb-1.4.6/cimcClientSfcbLocal.h sblim-sfcb-1.4.8/cimcClientSfcbLocal.h --- sblim-sfcb-1.4.6/cimcClientSfcbLocal.h 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/cimcClientSfcbLocal.h 2014-03-26 23:46:28.000000000 +0000 @@ -83,305 +83,65 @@ (Client * cl); Client *(*clone) (Client * cl, CMPIStatus *st); CMPIConstClass *(*getClass) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, CMPIFlags flags, char **properties, CMPIStatus *rc); CMPIEnumeration *(*enumClassNames) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, CMPIFlags flags, CMPIStatus *rc); CMPIEnumeration *(*enumClasses) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, CMPIFlags flags, CMPIStatus *rc); CMPIInstance *(*getInstance) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, CMPIFlags flags, char **properties, CMPIStatus *rc); CMPIObjectPath *(*createInstance) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, CMPIInstance *inst, CMPIStatus *rc); CMPIStatus (*setInstance) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, CMPIInstance *inst, CMPIFlags flags, char **properties); CMPIStatus (*deleteInstance) (Client * cl, CMPIObjectPath * op); CMPIEnumeration *(*execQuery) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, const char *query, const char *lang, CMPIStatus *rc); CMPIEnumeration *(*enumInstanceNames) (Client * cl, CMPIObjectPath * op, CMPIStatus *rc); CMPIEnumeration *(*enumInstances) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, CMPIFlags flags, char **properties, CMPIStatus *rc); CMPIEnumeration *(*associators) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, const char *assocClass, const char *resultClass, const char *role, const char *resultRole, CMPIFlags flags, char **properties, CMPIStatus *rc); CMPIEnumeration *(*associatorNames) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, const char *assocClass, const char *resultClass, const char *role, const char *resultRole, CMPIStatus *rc); CMPIEnumeration *(*references) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, const char *resultClass, const char *role, CMPIFlags flags, char **properties, CMPIStatus *rc); CMPIEnumeration *(*referenceNames) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, const char *resultClass, const char *role, CMPIStatus *rc); CMPIData (*invokeMethod) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, const char *method, CMPIArgs * in, CMPIArgs * out, CMPIStatus *rc); CMPIStatus (*setProperty) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, const char *name, CMPIValue * value, CMPIType type); CMPIData (*getProperty) - - - - - - - - - - - - - - - - (Client * cl, CMPIObjectPath * op, const char *name, CMPIStatus *rc); } ClientFT; @@ -390,111 +150,36 @@ char *env; void *(*release) (ClientEnv *ce); Client *(*connect) - - - - - - - - - - - - - - - - (ClientEnv *ce, const char *hn, const char *scheme, const char *port, const char *user, const char *pwd, CMPIStatus *rc); Client *(*connect2) - - - - - - - - - - - - - - - - (ClientEnv *ce, const char *hn, const char *scheme, const char *port, const char *user, const char *pwd, int verifyMode, const char *trustStore, const char *certFile, const char *keyFile, CMPIStatus *rc); CMPIInstance *(*newInstance) - - - - - - - - (ClientEnv *ce, const CMPIObjectPath * op, CMPIStatus *rc); CMPIObjectPath *(*newObjectPath) - - - - - - - - - - - - - (ClientEnv *ce, const char *ns, const char *cn, CMPIStatus *rc); CMPIArgs *(*newArgs) (ClientEnv *ce, CMPIStatus *rc); CMPIString *(*newString) (ClientEnv *ce, const char *data, CMPIStatus *rc); CMPIArray *(*newArray) - - - - - - - - - - - (ClientEnv *ce, CMPICount max, CMPIType type, CMPIStatus *rc); CMPIDateTime *(*newDateTime) (ClientEnv *ce, CMPIStatus *rc); CMPIDateTime *(*newDateTimeFromBinary) - - - - - - - - - - - - - - - - (ClientEnv *ce, CMPIUint64 binTime, CMPIBoolean interval, CMPIStatus *rc); CMPIDateTime *(*newDateTimeFromChars) (ClientEnv *ce, const char *utcTime, CMPIStatus *rc); + void *(*newIndicationListener) + (ClientEnv *ce, int sslMode, int *portNumber, char **socketName, + void (*fp) (CMPIInstance *indInstance), CMPIStatus* rc); + void *(*markHeap)(); + void (*releaseHeap) (void* heap); } ClientEnvFT; struct _ClientEnv { diff -Nru sblim-sfcb-1.4.6/cimRequest.c sblim-sfcb-1.4.8/cimRequest.c --- sblim-sfcb-1.4.6/cimRequest.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/cimRequest.c 2014-03-26 23:46:27.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: cimRequest.c,v 1.57 2010/01/15 20:58:33 buccella Exp $ + * $Id: cimRequest.c 8bcac6c on Wed May 15 00:21:19 2013 -0400 by Dave Heller $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/cimXmlGen.c sblim-sfcb-1.4.8/cimXmlGen.c --- sblim-sfcb-1.4.6/cimXmlGen.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/cimXmlGen.c 2014-03-26 23:46:28.000000000 +0000 @@ -611,10 +611,14 @@ splen = 0; } } else if (d.type == CMPI_instance) { - // SFCB_APPENDCHARS_BLOCK(sb, ""); - add_escaped_instance(sb, d.value.inst); + extern int useCDATA; + if (useCDATA) { + 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 @@ 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 @@ SFCB_APPENDCHARS_BLOCK(sb, "\" PARAMTYPE=\"string\">\n"); else SFCB_APPENDCHARS_BLOCK(sb, "\" TYPE=\"string\">\n"); + if (data->value.inst) { SFCB_APPENDCHARS_BLOCK(sb, ""); - // SFCB_APPENDCHARS_BLOCK(sb, "value.inst, sb, 0); - // SFCB_APPENDCHARS_BLOCK(sb, "]]>"); - add_escaped_instance(sb, data->value.inst); + extern int useCDATA; + if (useCDATA) { + SFCB_APPENDCHARS_BLOCK(sb, "value.inst, sb, 0); + SFCB_APPENDCHARS_BLOCK(sb, "]]>"); + } else { + add_escaped_instance(sb, data->value.inst); + } SFCB_APPENDCHARS_BLOCK(sb, "\n"); } } diff -Nru sblim-sfcb-1.4.6/cimXmlOps.c sblim-sfcb-1.4.8/cimXmlOps.c --- sblim-sfcb-1.4.6/cimXmlOps.c 2013-10-02 15:24:53.000000000 +0000 +++ sblim-sfcb-1.4.8/cimXmlOps.c 2014-03-26 23:56:52.000000000 +0000 @@ -149,7 +149,7 @@ -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); @@ -2187,7 +2187,7 @@ { /* Line 293 of yacc.c */ -#line 1810 "cimXmlOps.y" +#line 1811 "cimXmlOps.y" int intValue; char boolValue; @@ -2873,53 +2873,53 @@ /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 2325, 2325, 2331, 2337, 2343, 2349, 2352, 2355, 2358, - 2361, 2364, 2367, 2370, 2373, 2376, 2379, 2382, 2385, 2388, - 2391, 2394, 2397, 2400, 2403, 2406, 2409, 2412, 2415, 2418, - 2421, 2424, 2427, 2430, 2433, 2436, 2439, 2442, 2445, 2448, - 2451, 2462, 2475, 2487, 2501, 2517, 2523, 2530, 2535, 2545, - 2557, 2562, 2568, 2573, 2578, 2583, 2588, 2600, 2614, 2619, - 2631, 2642, 2658, 2664, 2679, 2686, 2693, 2702, 2715, 2720, - 2731, 2744, 2754, 2767, 2777, 2793, 2808, 2819, 2833, 2850, - 2861, 2875, 2883, 2890, 2894, 2901, 2905, 2912, 2916, 2923, - 2935, 2946, 2960, 2965, 2973, 2978, 2983, 2989, 3001, 3012, - 3026, 3032, 3041, 3045, 3050, 3054, 3060, 3064, 3070, 3074, - 3080, 3084, 3097, 3112, 3130, 3141, 3155, 3163, 3170, 3174, - 3181, 3185, 3192, 3196, 3203, 3216, 3227, 3242, 3255, 3265, - 3280, 3292, 3305, 3322, 3333, 3348, 3356, 3363, 3367, 3374, - 3386, 3396, 3411, 3423, 3433, 3448, 3461, 3480, 3493, 3509, - 3519, 3532, 3539, 3547, 3551, 3559, 3563, 3571, 3575, 3583, - 3587, 3594, 3608, 3621, 3643, 3661, 3683, 3700, 3720, 3729, - 3743, 3751, 3755, 3763, 3767, 3775, 3779, 3787, 3791, 3800, - 3804, 3813, 3817, 3824, 3839, 3855, 3875, 3890, 3908, 3917, - 3928, 3936, 3940, 3948, 3952, 3961, 3965, 3974, 3978, 3985, - 3998, 4013, 4031, 4042, 4056, 4062, 4070, 4076, 4080, 4086, - 4090, 4096, 4100, 4106, 4120, 4133, 4150, 4159, 4171, 4177, - 4185, 4191, 4195, 4201, 4213, 4226, 4241, 4242, 4247, 4251, - 4258, 4273, 4274, 4281, 4295, 4296, 4311, 4325, 4331, 4335, - 4346, 4347, 4356, 4359, 4364, 4375, 4376, 4386, 4398, 4403, - 4419, 4422, 4431, 4436, 4440, 4444, 4457, 4461, 4475, 4482, - 4486, 4499, 4507, 4513, 4532, 4541, 4554, 4560, 4566, 4570, - 4578, 4583, 4593, 4600, 4612, 4617, 4622, 4630, 4637, 4644, - 4656, 4668, 4679, 4697, 4707, 4720, 4725, 4731, 4735, 4740, - 4744, 4749, 4753, 4758, 4762, 4767, 4779, 4792, 4812, 4826, - 4843, 4848, 4854, 4858, 4864, 4868, 4874, 4878, 4884, 4888, - 4894, 4898, 4904, 4908, 4913, 4917, 4922, 4926, 4931, 4935, - 4940, 4952, 4969, 4993, 5010, 5030, 5036, 5041, 5045, 5050, - 5054, 5059, 5063, 5068, 5072, 5078, 5082, 5087, 5091, 5096, - 5100, 5105, 5109, 5114, 5126, 5144, 5170, 5191, 5215, 5221, - 5226, 5230, 5235, 5239, 5244, 5248, 5253, 5257, 5263, 5267, - 5273, 5277, 5283, 5287, 5293, 5297, 5302, 5306, 5311, 5315, - 5320, 5324, 5329, 5341, 5356, 5378, 5393, 5411, 5417, 5422, - 5426, 5431, 5435, 5441, 5445, 5450, 5454, 5459, 5463, 5468, - 5472, 5477, 5489, 5505, 5529, 5548, 5570, 5576, 5581, 5585, - 5590, 5594, 5600, 5604, 5610, 5614, 5620, 5624, 5630, 5634, - 5639, 5643, 5648, 5652, 5657, 5661, 5666, 5678, 5688, 5708, - 5717, 5729, 5735, 5739, 5745, 5749, 5754, 5758, 5763, 5767, - 5772, 5776, 5781, 5792, 5802, 5817, 5822, 5830, 5835, 5839, - 5844, 5856, 5867, 5883, 5888, 5896, 5901, 5905, 5910, 5922, - 5933, 5949, 5954, 5962, 5967, 5971, 5976, 5987, 6005, 6020, - 6027, 6039, 6045, 6053, 6063, 6078, 6084 + 0, 2326, 2326, 2332, 2338, 2344, 2350, 2353, 2356, 2359, + 2362, 2365, 2368, 2371, 2374, 2377, 2380, 2383, 2386, 2389, + 2392, 2395, 2398, 2401, 2404, 2407, 2410, 2413, 2416, 2419, + 2422, 2425, 2428, 2431, 2434, 2437, 2440, 2443, 2446, 2449, + 2452, 2463, 2476, 2488, 2502, 2518, 2524, 2531, 2536, 2546, + 2558, 2563, 2569, 2574, 2579, 2584, 2589, 2601, 2615, 2620, + 2632, 2643, 2659, 2665, 2680, 2687, 2694, 2703, 2716, 2721, + 2732, 2745, 2755, 2768, 2778, 2794, 2809, 2820, 2834, 2851, + 2862, 2876, 2884, 2891, 2895, 2902, 2906, 2913, 2917, 2924, + 2936, 2947, 2961, 2966, 2974, 2979, 2984, 2990, 3002, 3013, + 3027, 3033, 3042, 3046, 3051, 3055, 3061, 3065, 3071, 3075, + 3081, 3085, 3098, 3113, 3131, 3142, 3156, 3164, 3171, 3175, + 3182, 3186, 3193, 3197, 3204, 3217, 3228, 3243, 3256, 3266, + 3281, 3293, 3306, 3323, 3334, 3349, 3357, 3364, 3368, 3375, + 3387, 3397, 3412, 3424, 3434, 3449, 3462, 3481, 3494, 3510, + 3520, 3533, 3540, 3548, 3552, 3560, 3564, 3572, 3576, 3584, + 3588, 3595, 3609, 3622, 3644, 3662, 3684, 3701, 3721, 3730, + 3744, 3752, 3756, 3764, 3768, 3776, 3780, 3788, 3792, 3801, + 3805, 3814, 3818, 3825, 3840, 3856, 3876, 3891, 3909, 3918, + 3929, 3937, 3941, 3949, 3953, 3962, 3966, 3975, 3979, 3986, + 3999, 4014, 4032, 4043, 4057, 4063, 4071, 4077, 4081, 4087, + 4091, 4097, 4101, 4107, 4121, 4134, 4151, 4160, 4172, 4178, + 4186, 4192, 4196, 4202, 4214, 4227, 4242, 4243, 4248, 4252, + 4259, 4274, 4275, 4282, 4296, 4297, 4312, 4326, 4332, 4336, + 4347, 4348, 4357, 4360, 4365, 4376, 4377, 4387, 4399, 4404, + 4420, 4423, 4432, 4437, 4441, 4445, 4458, 4462, 4476, 4483, + 4487, 4500, 4508, 4514, 4533, 4542, 4555, 4561, 4567, 4571, + 4579, 4584, 4594, 4601, 4613, 4618, 4623, 4631, 4638, 4645, + 4657, 4669, 4680, 4698, 4708, 4721, 4726, 4732, 4736, 4741, + 4745, 4750, 4754, 4759, 4763, 4768, 4780, 4793, 4813, 4827, + 4844, 4849, 4855, 4859, 4865, 4869, 4875, 4879, 4885, 4889, + 4895, 4899, 4905, 4909, 4914, 4918, 4923, 4927, 4932, 4936, + 4941, 4953, 4970, 4994, 5011, 5031, 5037, 5042, 5046, 5051, + 5055, 5060, 5064, 5069, 5073, 5079, 5083, 5088, 5092, 5097, + 5101, 5106, 5110, 5115, 5127, 5145, 5171, 5192, 5216, 5222, + 5227, 5231, 5236, 5240, 5245, 5249, 5254, 5258, 5264, 5268, + 5274, 5278, 5284, 5288, 5294, 5298, 5303, 5307, 5312, 5316, + 5321, 5325, 5330, 5342, 5357, 5379, 5394, 5412, 5418, 5423, + 5427, 5432, 5436, 5442, 5446, 5451, 5455, 5460, 5464, 5469, + 5473, 5478, 5490, 5506, 5530, 5549, 5571, 5577, 5582, 5586, + 5591, 5595, 5601, 5605, 5611, 5615, 5621, 5625, 5631, 5635, + 5640, 5644, 5649, 5653, 5658, 5662, 5667, 5679, 5689, 5709, + 5718, 5730, 5736, 5740, 5746, 5750, 5755, 5759, 5764, 5768, + 5773, 5777, 5782, 5793, 5803, 5818, 5823, 5831, 5836, 5840, + 5845, 5857, 5868, 5884, 5889, 5897, 5902, 5906, 5911, 5923, + 5934, 5950, 5955, 5963, 5968, 5972, 5977, 5988, 6006, 6021, + 6028, 6040, 6046, 6054, 6064, 6079, 6085 }; #endif @@ -3748,7 +3748,7 @@ } \ else \ { \ - yyerror (YY_("syntax error: cannot back up")); \ + yyerror (parm, YY_("syntax error: cannot back up")); \ YYERROR; \ } \ while (YYID (0)) @@ -3819,7 +3819,7 @@ { \ YYFPRINTF (stderr, "%s ", Title); \ yy_symbol_print (stderr, \ - Type, Value); \ + Type, Value, parm); \ YYFPRINTF (stderr, "\n"); \ } \ } while (YYID (0)) @@ -3833,17 +3833,19 @@ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, void* parm) #else static void -yy_symbol_value_print (yyoutput, yytype, yyvaluep) +yy_symbol_value_print (yyoutput, yytype, yyvaluep, parm) FILE *yyoutput; int yytype; YYSTYPE const * const yyvaluep; + void* parm; #endif { if (!yyvaluep) return; + YYUSE (parm); # ifdef YYPRINT if (yytype < YYNTOKENS) YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); @@ -3865,13 +3867,14 @@ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, void* parm) #else static void -yy_symbol_print (yyoutput, yytype, yyvaluep) +yy_symbol_print (yyoutput, yytype, yyvaluep, parm) FILE *yyoutput; int yytype; YYSTYPE const * const yyvaluep; + void* parm; #endif { if (yytype < YYNTOKENS) @@ -3879,7 +3882,7 @@ else YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); + yy_symbol_value_print (yyoutput, yytype, yyvaluep, parm); YYFPRINTF (yyoutput, ")"); } @@ -3922,12 +3925,13 @@ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yy_reduce_print (YYSTYPE *yyvsp, int yyrule) +yy_reduce_print (YYSTYPE *yyvsp, int yyrule, void* parm) #else static void -yy_reduce_print (yyvsp, yyrule) +yy_reduce_print (yyvsp, yyrule, parm) YYSTYPE *yyvsp; int yyrule; + void* parm; #endif { int yynrhs = yyr2[yyrule]; @@ -3941,7 +3945,7 @@ YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi], &(yyvsp[(yyi + 1) - (yynrhs)]) - ); + , parm); YYFPRINTF (stderr, "\n"); } } @@ -3949,7 +3953,7 @@ # define YY_REDUCE_PRINT(Rule) \ do { \ if (yydebug) \ - yy_reduce_print (yyvsp, Rule); \ + yy_reduce_print (yyvsp, Rule, parm); \ } while (YYID (0)) /* Nonzero means print parse trace. It is left uninitialized so that @@ -4226,16 +4230,18 @@ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) static void -yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep) +yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, void* parm) #else static void -yydestruct (yymsg, yytype, yyvaluep) +yydestruct (yymsg, yytype, yyvaluep, parm) const char *yymsg; int yytype; YYSTYPE *yyvaluep; + void* parm; #endif { YYUSE (yyvaluep); + YYUSE (parm); if (!yymsg) yymsg = "Deleting"; @@ -4259,7 +4265,7 @@ #endif #else /* ! YYPARSE_PARAM */ #if defined __STDC__ || defined __cplusplus -int yyparse (void); +int yyparse (void* parm); #else int yyparse (); #endif @@ -4284,11 +4290,11 @@ #if (defined __STDC__ || defined __C99__FUNC__ \ || defined __cplusplus || defined _MSC_VER) int -yyparse (void) +yyparse (void* parm) #else int -yyparse () - +yyparse (parm) + void* parm; #endif #endif { @@ -4543,7 +4549,7 @@ case 2: /* Line 1806 of yacc.c */ -#line 2326 "cimXmlOps.y" +#line 2327 "cimXmlOps.y" { } break; @@ -4551,7 +4557,7 @@ case 3: /* Line 1806 of yacc.c */ -#line 2332 "cimXmlOps.y" +#line 2333 "cimXmlOps.y" { } break; @@ -4559,7 +4565,7 @@ case 4: /* Line 1806 of yacc.c */ -#line 2338 "cimXmlOps.y" +#line 2339 "cimXmlOps.y" { } break; @@ -4567,7 +4573,7 @@ case 5: /* Line 1806 of yacc.c */ -#line 2344 "cimXmlOps.y" +#line 2345 "cimXmlOps.y" { } break; @@ -4575,7 +4581,7 @@ case 6: /* Line 1806 of yacc.c */ -#line 2350 "cimXmlOps.y" +#line 2351 "cimXmlOps.y" { } break; @@ -4583,7 +4589,7 @@ case 7: /* Line 1806 of yacc.c */ -#line 2353 "cimXmlOps.y" +#line 2354 "cimXmlOps.y" { } break; @@ -4591,7 +4597,7 @@ case 8: /* Line 1806 of yacc.c */ -#line 2356 "cimXmlOps.y" +#line 2357 "cimXmlOps.y" { } break; @@ -4599,7 +4605,7 @@ case 9: /* Line 1806 of yacc.c */ -#line 2359 "cimXmlOps.y" +#line 2360 "cimXmlOps.y" { } break; @@ -4607,7 +4613,7 @@ case 10: /* Line 1806 of yacc.c */ -#line 2362 "cimXmlOps.y" +#line 2363 "cimXmlOps.y" { } break; @@ -4615,7 +4621,7 @@ case 11: /* Line 1806 of yacc.c */ -#line 2365 "cimXmlOps.y" +#line 2366 "cimXmlOps.y" { } break; @@ -4623,7 +4629,7 @@ case 12: /* Line 1806 of yacc.c */ -#line 2368 "cimXmlOps.y" +#line 2369 "cimXmlOps.y" { } break; @@ -4631,7 +4637,7 @@ case 13: /* Line 1806 of yacc.c */ -#line 2371 "cimXmlOps.y" +#line 2372 "cimXmlOps.y" { } break; @@ -4639,7 +4645,7 @@ case 14: /* Line 1806 of yacc.c */ -#line 2374 "cimXmlOps.y" +#line 2375 "cimXmlOps.y" { } break; @@ -4647,7 +4653,7 @@ case 15: /* Line 1806 of yacc.c */ -#line 2377 "cimXmlOps.y" +#line 2378 "cimXmlOps.y" { } break; @@ -4655,7 +4661,7 @@ case 16: /* Line 1806 of yacc.c */ -#line 2380 "cimXmlOps.y" +#line 2381 "cimXmlOps.y" { } break; @@ -4663,7 +4669,7 @@ case 17: /* Line 1806 of yacc.c */ -#line 2383 "cimXmlOps.y" +#line 2384 "cimXmlOps.y" { } break; @@ -4671,7 +4677,7 @@ case 18: /* Line 1806 of yacc.c */ -#line 2386 "cimXmlOps.y" +#line 2387 "cimXmlOps.y" { } break; @@ -4679,7 +4685,7 @@ case 19: /* Line 1806 of yacc.c */ -#line 2389 "cimXmlOps.y" +#line 2390 "cimXmlOps.y" { } break; @@ -4687,7 +4693,7 @@ case 20: /* Line 1806 of yacc.c */ -#line 2392 "cimXmlOps.y" +#line 2393 "cimXmlOps.y" { } break; @@ -4695,7 +4701,7 @@ case 21: /* Line 1806 of yacc.c */ -#line 2395 "cimXmlOps.y" +#line 2396 "cimXmlOps.y" { } break; @@ -4703,7 +4709,7 @@ case 22: /* Line 1806 of yacc.c */ -#line 2398 "cimXmlOps.y" +#line 2399 "cimXmlOps.y" { } break; @@ -4711,7 +4717,7 @@ case 23: /* Line 1806 of yacc.c */ -#line 2401 "cimXmlOps.y" +#line 2402 "cimXmlOps.y" { } break; @@ -4719,7 +4725,7 @@ case 24: /* Line 1806 of yacc.c */ -#line 2404 "cimXmlOps.y" +#line 2405 "cimXmlOps.y" { } break; @@ -4727,7 +4733,7 @@ case 25: /* Line 1806 of yacc.c */ -#line 2407 "cimXmlOps.y" +#line 2408 "cimXmlOps.y" { } break; @@ -4735,7 +4741,7 @@ case 26: /* Line 1806 of yacc.c */ -#line 2410 "cimXmlOps.y" +#line 2411 "cimXmlOps.y" { } break; @@ -4743,7 +4749,7 @@ case 27: /* Line 1806 of yacc.c */ -#line 2413 "cimXmlOps.y" +#line 2414 "cimXmlOps.y" { } break; @@ -4751,7 +4757,7 @@ case 28: /* Line 1806 of yacc.c */ -#line 2416 "cimXmlOps.y" +#line 2417 "cimXmlOps.y" { } break; @@ -4759,7 +4765,7 @@ case 29: /* Line 1806 of yacc.c */ -#line 2419 "cimXmlOps.y" +#line 2420 "cimXmlOps.y" { } break; @@ -4767,7 +4773,7 @@ case 30: /* Line 1806 of yacc.c */ -#line 2422 "cimXmlOps.y" +#line 2423 "cimXmlOps.y" { } break; @@ -4775,7 +4781,7 @@ case 31: /* Line 1806 of yacc.c */ -#line 2425 "cimXmlOps.y" +#line 2426 "cimXmlOps.y" { } break; @@ -4783,7 +4789,7 @@ case 32: /* Line 1806 of yacc.c */ -#line 2428 "cimXmlOps.y" +#line 2429 "cimXmlOps.y" { } break; @@ -4791,7 +4797,7 @@ case 33: /* Line 1806 of yacc.c */ -#line 2431 "cimXmlOps.y" +#line 2432 "cimXmlOps.y" { } break; @@ -4799,7 +4805,7 @@ case 34: /* Line 1806 of yacc.c */ -#line 2434 "cimXmlOps.y" +#line 2435 "cimXmlOps.y" { } break; @@ -4807,7 +4813,7 @@ case 35: /* Line 1806 of yacc.c */ -#line 2437 "cimXmlOps.y" +#line 2438 "cimXmlOps.y" { } break; @@ -4815,7 +4821,7 @@ case 36: /* Line 1806 of yacc.c */ -#line 2440 "cimXmlOps.y" +#line 2441 "cimXmlOps.y" { } break; @@ -4823,7 +4829,7 @@ case 37: /* Line 1806 of yacc.c */ -#line 2443 "cimXmlOps.y" +#line 2444 "cimXmlOps.y" { } break; @@ -4831,7 +4837,7 @@ case 38: /* Line 1806 of yacc.c */ -#line 2446 "cimXmlOps.y" +#line 2447 "cimXmlOps.y" { } break; @@ -4839,7 +4845,7 @@ case 39: /* Line 1806 of yacc.c */ -#line 2449 "cimXmlOps.y" +#line 2450 "cimXmlOps.y" { } break; @@ -4847,7 +4853,7 @@ case 40: /* Line 1806 of yacc.c */ -#line 2452 "cimXmlOps.y" +#line 2453 "cimXmlOps.y" { } break; @@ -4855,7 +4861,7 @@ case 41: /* Line 1806 of yacc.c */ -#line 2463 "cimXmlOps.y" +#line 2464 "cimXmlOps.y" { (yyval.xtokMethodCall).op.count = IM_REQ_REG_SEGMENTS; (yyval.xtokMethodCall).op.type = OPS_InvokeMethod; @@ -4873,7 +4879,7 @@ case 42: /* Line 1806 of yacc.c */ -#line 2476 "cimXmlOps.y" +#line 2477 "cimXmlOps.y" { (yyval.xtokMethodCall).op.count = IM_REQ_REG_SEGMENTS; (yyval.xtokMethodCall).op.type = OPS_InvokeMethod; @@ -4890,7 +4896,7 @@ case 43: /* Line 1806 of yacc.c */ -#line 2488 "cimXmlOps.y" +#line 2489 "cimXmlOps.y" { (yyval.xtokMethodCall).op.count = IM_REQ_REG_SEGMENTS; (yyval.xtokMethodCall).op.type = OPS_InvokeMethod; @@ -4909,7 +4915,7 @@ case 44: /* Line 1806 of yacc.c */ -#line 2502 "cimXmlOps.y" +#line 2503 "cimXmlOps.y" { (yyval.xtokMethodCall).op.count = IM_REQ_REG_SEGMENTS; (yyval.xtokMethodCall).op.type = OPS_InvokeMethod; @@ -4927,7 +4933,7 @@ case 45: /* Line 1806 of yacc.c */ -#line 2518 "cimXmlOps.y" +#line 2519 "cimXmlOps.y" { (yyval.xtokParamValues).first = NULL; (yyval.xtokParamValues).last = NULL; @@ -4938,7 +4944,7 @@ case 46: /* Line 1806 of yacc.c */ -#line 2524 "cimXmlOps.y" +#line 2525 "cimXmlOps.y" { addParamValue(&(yyval.xtokParamValues),&(yyvsp[(2) - (2)].xtokParamValue)); } @@ -4947,17 +4953,17 @@ case 47: /* Line 1806 of yacc.c */ -#line 2531 "cimXmlOps.y" +#line 2532 "cimXmlOps.y" { (yyval.xtokParamValue).value.value=NULL; - (yyval.xtokParamValue).type=-1; + (yyval.xtokParamValue).type=0; } break; case 48: /* Line 1806 of yacc.c */ -#line 2536 "cimXmlOps.y" +#line 2537 "cimXmlOps.y" { (yyval.xtokParamValue).value=(yyvsp[(2) - (3)].xtokValue); if((yyval.xtokParamValue).value.type == typeValue_Instance) { @@ -4972,7 +4978,7 @@ case 49: /* Line 1806 of yacc.c */ -#line 2546 "cimXmlOps.y" +#line 2547 "cimXmlOps.y" { (yyval.xtokParamValue).valueArray=(yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokParamValue).type|=CMPI_ARRAY; @@ -4989,7 +4995,7 @@ case 50: /* Line 1806 of yacc.c */ -#line 2558 "cimXmlOps.y" +#line 2559 "cimXmlOps.y" { (yyval.xtokParamValue).valueRef=(yyvsp[(2) - (3)].xtokValueReference); (yyval.xtokParamValue).type=CMPI_ref; @@ -4999,7 +5005,7 @@ case 51: /* Line 1806 of yacc.c */ -#line 2563 "cimXmlOps.y" +#line 2564 "cimXmlOps.y" { (yyval.xtokParamValue).valueRefArray=(yyvsp[(2) - (3)].xtokValueRefArray); (yyval.xtokParamValue).type=CMPI_ARRAY | CMPI_ref; @@ -5009,7 +5015,7 @@ case 52: /* Line 1806 of yacc.c */ -#line 2569 "cimXmlOps.y" +#line 2570 "cimXmlOps.y" { (yyval.xtokParamValue).className=(yyvsp[(2) - (3)].className); if (!(yyval.xtokParamValue).type) (yyval.xtokParamValue).type=CMPI_class; /* should this be CMPI_string? */ @@ -5019,7 +5025,7 @@ case 53: /* Line 1806 of yacc.c */ -#line 2574 "cimXmlOps.y" +#line 2575 "cimXmlOps.y" { (yyval.xtokParamValue).instanceName=(yyvsp[(2) - (3)].xtokInstanceName); if (!(yyval.xtokParamValue).type) (yyval.xtokParamValue).type=CMPI_instance; @@ -5029,7 +5035,7 @@ case 54: /* Line 1806 of yacc.c */ -#line 2579 "cimXmlOps.y" +#line 2580 "cimXmlOps.y" { //$$.class=$2; if (!(yyval.xtokParamValue).type) (yyval.xtokParamValue).type=CMPI_class; @@ -5039,7 +5045,7 @@ case 55: /* Line 1806 of yacc.c */ -#line 2584 "cimXmlOps.y" +#line 2585 "cimXmlOps.y" { (yyval.xtokParamValue).instance=(yyvsp[(2) - (3)].xtokInstance); if (!(yyval.xtokParamValue).type) (yyval.xtokParamValue).type=CMPI_instance; @@ -5049,7 +5055,7 @@ case 56: /* Line 1806 of yacc.c */ -#line 2589 "cimXmlOps.y" +#line 2590 "cimXmlOps.y" { (yyval.xtokParamValue).namedInstance=(yyvsp[(2) - (3)].xtokNamedInstance); /* should we ignore paramtype from the XML and always set to CMPI_instance? */ @@ -5060,7 +5066,7 @@ case 57: /* Line 1806 of yacc.c */ -#line 2601 "cimXmlOps.y" +#line 2602 "cimXmlOps.y" { (yyval.xtokGetProperty).op.count = 3; (yyval.xtokGetProperty).op.type = OPS_GetProperty; @@ -5076,7 +5082,7 @@ case 58: /* Line 1806 of yacc.c */ -#line 2615 "cimXmlOps.y" +#line 2616 "cimXmlOps.y" { (yyval.xtokGetPropertyParm).name = (yyvsp[(2) - (6)].xtokValue).value; (yyval.xtokGetPropertyParm).instanceName = (yyvsp[(5) - (6)].xtokInstanceName); @@ -5086,7 +5092,7 @@ case 59: /* Line 1806 of yacc.c */ -#line 2620 "cimXmlOps.y" +#line 2621 "cimXmlOps.y" { (yyval.xtokGetPropertyParm).name = (yyvsp[(5) - (6)].xtokValue).value; (yyval.xtokGetPropertyParm).instanceName = (yyvsp[(2) - (6)].xtokInstanceName); @@ -5096,7 +5102,7 @@ case 60: /* Line 1806 of yacc.c */ -#line 2632 "cimXmlOps.y" +#line 2633 "cimXmlOps.y" { (yyval.xtokSetProperty).op.count = 3; (yyval.xtokSetProperty).op.type = OPS_SetProperty; @@ -5112,7 +5118,7 @@ case 61: /* Line 1806 of yacc.c */ -#line 2643 "cimXmlOps.y" +#line 2644 "cimXmlOps.y" { (yyval.xtokSetProperty).op.count = 3; (yyval.xtokSetProperty).op.type = OPS_SetProperty; @@ -5130,7 +5136,7 @@ case 62: /* Line 1806 of yacc.c */ -#line 2659 "cimXmlOps.y" +#line 2660 "cimXmlOps.y" { (yyval.xtokSetPropertyParmsList).newVal = (yyvsp[(1) - (1)].xtokSetPropertyParms).newVal; (yyval.xtokSetPropertyParmsList).instanceName = (yyvsp[(1) - (1)].xtokSetPropertyParms).instanceName; @@ -5141,7 +5147,7 @@ case 63: /* Line 1806 of yacc.c */ -#line 2665 "cimXmlOps.y" +#line 2666 "cimXmlOps.y" { if((yyvsp[(2) - (2)].xtokSetPropertyParms).propertyName) { (yyval.xtokSetPropertyParmsList).propertyName = (yyvsp[(2) - (2)].xtokSetPropertyParms).propertyName; @@ -5158,7 +5164,7 @@ case 64: /* Line 1806 of yacc.c */ -#line 2680 "cimXmlOps.y" +#line 2681 "cimXmlOps.y" { (yyval.xtokSetPropertyParms).instanceName = (yyvsp[(2) - (3)].xtokInstanceName); (yyval.xtokSetPropertyParms).propertyName = NULL; @@ -5170,7 +5176,7 @@ case 65: /* Line 1806 of yacc.c */ -#line 2687 "cimXmlOps.y" +#line 2688 "cimXmlOps.y" { (yyval.xtokSetPropertyParms).propertyName = (yyvsp[(2) - (3)].xtokValue).value; (yyval.xtokSetPropertyParms).instanceName.className = NULL; @@ -5182,7 +5188,7 @@ case 66: /* Line 1806 of yacc.c */ -#line 2694 "cimXmlOps.y" +#line 2695 "cimXmlOps.y" { (yyval.xtokSetPropertyParms).newVal = (yyvsp[(2) - (3)].xtokNewValue); (yyval.xtokSetPropertyParms).propertyName = NULL; @@ -5193,7 +5199,7 @@ case 67: /* Line 1806 of yacc.c */ -#line 2703 "cimXmlOps.y" +#line 2704 "cimXmlOps.y" { if((yyvsp[(1) - (1)].xtokValue).type == typeValue_Instance) { (yyval.xtokNewValue).type = CMPI_instance; @@ -5211,7 +5217,7 @@ case 68: /* Line 1806 of yacc.c */ -#line 2716 "cimXmlOps.y" +#line 2717 "cimXmlOps.y" { (yyval.xtokNewValue).arr = (yyvsp[(1) - (1)].xtokValueArray); (yyval.xtokNewValue).type = CMPI_ARRAY; @@ -5221,7 +5227,7 @@ case 69: /* Line 1806 of yacc.c */ -#line 2721 "cimXmlOps.y" +#line 2722 "cimXmlOps.y" { (yyval.xtokNewValue).ref = (yyvsp[(1) - (1)].xtokValueReference); (yyval.xtokNewValue).type = CMPI_ref; @@ -5231,7 +5237,7 @@ case 70: /* Line 1806 of yacc.c */ -#line 2732 "cimXmlOps.y" +#line 2733 "cimXmlOps.y" { (yyval.xtokGetQualifier).op.count = 2; (yyval.xtokGetQualifier).op.type = OPS_GetQualifier; @@ -5246,7 +5252,7 @@ case 71: /* Line 1806 of yacc.c */ -#line 2745 "cimXmlOps.y" +#line 2746 "cimXmlOps.y" { (yyval.xtokGetQualifierParm).name = (yyvsp[(2) - (3)].xtokValue).value; } @@ -5255,7 +5261,7 @@ case 72: /* Line 1806 of yacc.c */ -#line 2755 "cimXmlOps.y" +#line 2756 "cimXmlOps.y" { (yyval.xtokDeleteQualifier).op.count = 2; (yyval.xtokDeleteQualifier).op.type = OPS_DeleteQualifier; @@ -5270,7 +5276,7 @@ case 73: /* Line 1806 of yacc.c */ -#line 2768 "cimXmlOps.y" +#line 2769 "cimXmlOps.y" { (yyval.xtokDeleteQualifierParm).name = (yyvsp[(2) - (3)].xtokValue).value; } @@ -5279,7 +5285,7 @@ case 74: /* Line 1806 of yacc.c */ -#line 2778 "cimXmlOps.y" +#line 2779 "cimXmlOps.y" { (yyval.xtokEnumQualifiers).op.count = 2; (yyval.xtokEnumQualifiers).op.type = OPS_EnumerateQualifiers; @@ -5293,7 +5299,7 @@ case 75: /* Line 1806 of yacc.c */ -#line 2794 "cimXmlOps.y" +#line 2795 "cimXmlOps.y" { (yyval.xtokSetQualifier).op.count = 3; (yyval.xtokSetQualifier).op.type = OPS_SetQualifier; @@ -5309,7 +5315,7 @@ case 76: /* Line 1806 of yacc.c */ -#line 2809 "cimXmlOps.y" +#line 2810 "cimXmlOps.y" { (yyval.xtokSetQualifierParm).qualifierdeclaration = (yyvsp[(2) - (3)].xtokQualifierDeclaration); } @@ -5318,7 +5324,7 @@ case 77: /* Line 1806 of yacc.c */ -#line 2820 "cimXmlOps.y" +#line 2821 "cimXmlOps.y" { (yyval.xtokGetClass).op.count = GC_REQ_REG_SEGMENTS; (yyval.xtokGetClass).op.type = OPS_GetClass; @@ -5337,7 +5343,7 @@ case 78: /* Line 1806 of yacc.c */ -#line 2834 "cimXmlOps.y" +#line 2835 "cimXmlOps.y" { (yyval.xtokGetClass).op.count = GC_REQ_REG_SEGMENTS; (yyval.xtokGetClass).op.type = OPS_GetClass; @@ -5356,7 +5362,7 @@ case 79: /* Line 1806 of yacc.c */ -#line 2851 "cimXmlOps.y" +#line 2852 "cimXmlOps.y" { (yyval.xtokGetClassParmsList).flags=(yyvsp[(1) - (1)].xtokGetClassParms).flags; (yyval.xtokGetClassParmsList).flagsSet=(yyvsp[(1) - (1)].xtokGetClassParms).flagsSet; @@ -5372,7 +5378,7 @@ case 80: /* Line 1806 of yacc.c */ -#line 2862 "cimXmlOps.y" +#line 2863 "cimXmlOps.y" { (yyval.xtokGetClassParmsList).flags=(yyvsp[(1) - (2)].xtokGetClassParmsList).flags|(yyvsp[(2) - (2)].xtokGetClassParms).flags; (yyval.xtokGetClassParmsList).flagsSet=(yyvsp[(1) - (2)].xtokGetClassParmsList).flagsSet|(yyvsp[(2) - (2)].xtokGetClassParms).flagsSet; @@ -5388,7 +5394,7 @@ case 81: /* Line 1806 of yacc.c */ -#line 2876 "cimXmlOps.y" +#line 2877 "cimXmlOps.y" { (yyval.xtokGetClassParms).className = (yyvsp[(2) - (3)].className); (yyval.xtokGetClassParms).flags = (yyval.xtokGetClassParms).flagsSet = 0 ; @@ -5401,7 +5407,7 @@ case 82: /* Line 1806 of yacc.c */ -#line 2884 "cimXmlOps.y" +#line 2885 "cimXmlOps.y" { (yyval.xtokGetClassParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_localOnly : 0 ; (yyval.xtokGetClassParms).flagsSet = FL_localOnly; @@ -5413,7 +5419,7 @@ case 83: /* Line 1806 of yacc.c */ -#line 2891 "cimXmlOps.y" +#line 2892 "cimXmlOps.y" { memset(&(yyval.xtokGetClassParms), 0, sizeof((yyval.xtokGetClassParms))); } @@ -5422,7 +5428,7 @@ case 84: /* Line 1806 of yacc.c */ -#line 2895 "cimXmlOps.y" +#line 2896 "cimXmlOps.y" { (yyval.xtokGetClassParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; (yyval.xtokGetClassParms).flagsSet = FL_includeQualifiers; @@ -5434,7 +5440,7 @@ case 85: /* Line 1806 of yacc.c */ -#line 2902 "cimXmlOps.y" +#line 2903 "cimXmlOps.y" { memset(&(yyval.xtokGetClassParms), 0, sizeof((yyval.xtokGetClassParms))); } @@ -5443,7 +5449,7 @@ case 86: /* Line 1806 of yacc.c */ -#line 2906 "cimXmlOps.y" +#line 2907 "cimXmlOps.y" { (yyval.xtokGetClassParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; (yyval.xtokGetClassParms).flagsSet = FL_includeClassOrigin; @@ -5455,7 +5461,7 @@ case 87: /* Line 1806 of yacc.c */ -#line 2913 "cimXmlOps.y" +#line 2914 "cimXmlOps.y" { memset(&(yyval.xtokGetClassParms), 0, sizeof((yyval.xtokGetClassParms))); } @@ -5464,7 +5470,7 @@ case 88: /* Line 1806 of yacc.c */ -#line 2917 "cimXmlOps.y" +#line 2918 "cimXmlOps.y" { (yyval.xtokGetClassParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokGetClassParms).properties=(yyvsp[(2) - (3)].xtokValueArray).next; @@ -5476,7 +5482,7 @@ case 89: /* Line 1806 of yacc.c */ -#line 2924 "cimXmlOps.y" +#line 2925 "cimXmlOps.y" { memset(&(yyval.xtokGetClassParms), 0, sizeof((yyval.xtokGetClassParms))); } @@ -5485,7 +5491,7 @@ case 90: /* Line 1806 of yacc.c */ -#line 2936 "cimXmlOps.y" +#line 2937 "cimXmlOps.y" { (yyval.xtokEnumClassNames).op.count = ECN_REQ_REG_SEGMENTS; (yyval.xtokEnumClassNames).op.type = OPS_EnumerateClassNames; @@ -5501,7 +5507,7 @@ case 91: /* Line 1806 of yacc.c */ -#line 2947 "cimXmlOps.y" +#line 2948 "cimXmlOps.y" { (yyval.xtokEnumClassNames).op.count = ECN_REQ_REG_SEGMENTS; (yyval.xtokEnumClassNames).op.type = OPS_EnumerateClassNames; @@ -5517,7 +5523,7 @@ case 92: /* Line 1806 of yacc.c */ -#line 2961 "cimXmlOps.y" +#line 2962 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokEnumClassNamesParms).className) (yyval.xtokEnumClassNamesParmsList).className=(yyvsp[(1) - (1)].xtokEnumClassNamesParms).className; (yyval.xtokEnumClassNamesParmsList).flags=(yyvsp[(1) - (1)].xtokEnumClassNamesParms).flags; @@ -5527,7 +5533,7 @@ case 93: /* Line 1806 of yacc.c */ -#line 2966 "cimXmlOps.y" +#line 2967 "cimXmlOps.y" { if ((yyvsp[(2) - (2)].xtokEnumClassNamesParms).className) (yyval.xtokEnumClassNamesParmsList).className=(yyvsp[(2) - (2)].xtokEnumClassNamesParms).className; (yyval.xtokEnumClassNamesParmsList).flags = ((yyvsp[(2) - (2)].xtokEnumClassNamesParms).flags & (yyvsp[(2) - (2)].xtokEnumClassNamesParms).flagsSet) | ((~(yyvsp[(2) - (2)].xtokEnumClassNamesParms).flagsSet) & FL_deepInheritance); @@ -5537,7 +5543,7 @@ case 94: /* Line 1806 of yacc.c */ -#line 2974 "cimXmlOps.y" +#line 2975 "cimXmlOps.y" { (yyval.xtokEnumClassNamesParms).className = NULL; (yyval.xtokEnumClassNamesParms).flags = (yyval.xtokEnumClassNamesParms).flagsSet = 0 ; @@ -5547,7 +5553,7 @@ case 95: /* Line 1806 of yacc.c */ -#line 2979 "cimXmlOps.y" +#line 2980 "cimXmlOps.y" { (yyval.xtokEnumClassNamesParms).className = (yyvsp[(2) - (3)].className); (yyval.xtokEnumClassNamesParms).flags = (yyval.xtokEnumClassNamesParms).flagsSet = 0 ; @@ -5557,7 +5563,7 @@ case 96: /* Line 1806 of yacc.c */ -#line 2984 "cimXmlOps.y" +#line 2985 "cimXmlOps.y" { (yyval.xtokEnumClassNamesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_deepInheritance : 0 ; (yyval.xtokEnumClassNamesParms).flagsSet = FL_deepInheritance; @@ -5568,7 +5574,7 @@ case 97: /* Line 1806 of yacc.c */ -#line 2990 "cimXmlOps.y" +#line 2991 "cimXmlOps.y" { (yyval.xtokEnumClassNamesParms).className = NULL; (yyval.xtokEnumClassNamesParms).flags = (yyval.xtokEnumClassNamesParms).flagsSet = 0 ; @@ -5578,7 +5584,7 @@ case 98: /* Line 1806 of yacc.c */ -#line 3002 "cimXmlOps.y" +#line 3003 "cimXmlOps.y" { (yyval.xtokEnumClasses).op.count = EC_REQ_REG_SEGMENTS; (yyval.xtokEnumClasses).op.type = OPS_EnumerateClasses; @@ -5594,7 +5600,7 @@ case 99: /* Line 1806 of yacc.c */ -#line 3013 "cimXmlOps.y" +#line 3014 "cimXmlOps.y" { (yyval.xtokEnumClasses).op.count = EC_REQ_REG_SEGMENTS; (yyval.xtokEnumClasses).op.type = OPS_EnumerateClasses; @@ -5610,7 +5616,7 @@ case 100: /* Line 1806 of yacc.c */ -#line 3027 "cimXmlOps.y" +#line 3028 "cimXmlOps.y" { (yyval.xtokEnumClassesParmsList).flags=(yyvsp[(1) - (1)].xtokEnumClassesParms).flags; (yyval.xtokEnumClassesParmsList).flagsSet=(yyvsp[(1) - (1)].xtokEnumClassesParms).flagsSet; @@ -5621,7 +5627,7 @@ case 101: /* Line 1806 of yacc.c */ -#line 3033 "cimXmlOps.y" +#line 3034 "cimXmlOps.y" { (yyval.xtokEnumClassesParmsList).flags=(yyvsp[(1) - (2)].xtokEnumClassesParmsList).flags|(yyvsp[(2) - (2)].xtokEnumClassesParms).flags; (yyval.xtokEnumClassesParmsList).flagsSet=(yyvsp[(1) - (2)].xtokEnumClassesParmsList).flagsSet|(yyvsp[(2) - (2)].xtokEnumClassesParms).flagsSet; @@ -5632,7 +5638,7 @@ case 102: /* Line 1806 of yacc.c */ -#line 3042 "cimXmlOps.y" +#line 3043 "cimXmlOps.y" { memset(&(yyval.xtokEnumClassesParms), 0, sizeof((yyval.xtokEnumClassesParms))); } @@ -5641,7 +5647,7 @@ case 103: /* Line 1806 of yacc.c */ -#line 3046 "cimXmlOps.y" +#line 3047 "cimXmlOps.y" { (yyval.xtokEnumClassesParms).className = (yyvsp[(2) - (3)].className); (yyval.xtokEnumClassesParms).flags = (yyval.xtokEnumClassesParms).flagsSet = 0 ; @@ -5651,7 +5657,7 @@ case 104: /* Line 1806 of yacc.c */ -#line 3051 "cimXmlOps.y" +#line 3052 "cimXmlOps.y" { memset(&(yyval.xtokEnumClassesParms), 0, sizeof((yyval.xtokEnumClassesParms))); } @@ -5660,7 +5666,7 @@ case 105: /* Line 1806 of yacc.c */ -#line 3055 "cimXmlOps.y" +#line 3056 "cimXmlOps.y" { (yyval.xtokEnumClassesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_deepInheritance : 0 ; (yyval.xtokEnumClassesParms).flagsSet = FL_deepInheritance; @@ -5671,7 +5677,7 @@ case 106: /* Line 1806 of yacc.c */ -#line 3061 "cimXmlOps.y" +#line 3062 "cimXmlOps.y" { memset(&(yyval.xtokEnumClassesParms), 0, sizeof((yyval.xtokEnumClassesParms))); } @@ -5680,7 +5686,7 @@ case 107: /* Line 1806 of yacc.c */ -#line 3065 "cimXmlOps.y" +#line 3066 "cimXmlOps.y" { (yyval.xtokEnumClassesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_localOnly : 0 ; (yyval.xtokEnumClassesParms).flagsSet = FL_localOnly; @@ -5691,7 +5697,7 @@ case 108: /* Line 1806 of yacc.c */ -#line 3071 "cimXmlOps.y" +#line 3072 "cimXmlOps.y" { memset(&(yyval.xtokEnumClassesParms), 0, sizeof((yyval.xtokEnumClassesParms))); } @@ -5700,7 +5706,7 @@ case 109: /* Line 1806 of yacc.c */ -#line 3075 "cimXmlOps.y" +#line 3076 "cimXmlOps.y" { (yyval.xtokEnumClassesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; (yyval.xtokEnumClassesParms).flagsSet = FL_includeQualifiers; @@ -5711,7 +5717,7 @@ case 110: /* Line 1806 of yacc.c */ -#line 3081 "cimXmlOps.y" +#line 3082 "cimXmlOps.y" { memset(&(yyval.xtokEnumClassesParms), 0, sizeof((yyval.xtokEnumClassesParms))); } @@ -5720,7 +5726,7 @@ case 111: /* Line 1806 of yacc.c */ -#line 3085 "cimXmlOps.y" +#line 3086 "cimXmlOps.y" { (yyval.xtokEnumClassesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; (yyval.xtokEnumClassesParms).flagsSet = FL_includeClassOrigin; @@ -5731,7 +5737,7 @@ case 112: /* Line 1806 of yacc.c */ -#line 3098 "cimXmlOps.y" +#line 3099 "cimXmlOps.y" { (yyval.xtokGetInstance).op.count = GI_REQ_REG_SEGMENTS; (yyval.xtokGetInstance).op.type = OPS_GetInstance; @@ -5751,7 +5757,7 @@ case 113: /* Line 1806 of yacc.c */ -#line 3113 "cimXmlOps.y" +#line 3114 "cimXmlOps.y" { (yyval.xtokGetInstance).op.count = GI_REQ_REG_SEGMENTS; (yyval.xtokGetInstance).op.type = OPS_GetInstance; @@ -5771,7 +5777,7 @@ case 114: /* Line 1806 of yacc.c */ -#line 3131 "cimXmlOps.y" +#line 3132 "cimXmlOps.y" { (yyval.xtokGetInstanceParmsList).flags=(yyvsp[(1) - (1)].xtokGetInstanceParms).flags; (yyval.xtokGetInstanceParmsList).flagsSet=(yyvsp[(1) - (1)].xtokGetInstanceParms).flagsSet; @@ -5787,7 +5793,7 @@ case 115: /* Line 1806 of yacc.c */ -#line 3142 "cimXmlOps.y" +#line 3143 "cimXmlOps.y" { (yyval.xtokGetInstanceParmsList).flags=(yyvsp[(1) - (2)].xtokGetInstanceParmsList).flags|(yyvsp[(2) - (2)].xtokGetInstanceParms).flags; (yyval.xtokGetInstanceParmsList).flagsSet=(yyvsp[(1) - (2)].xtokGetInstanceParmsList).flagsSet|(yyvsp[(2) - (2)].xtokGetInstanceParms).flagsSet; @@ -5803,7 +5809,7 @@ case 116: /* Line 1806 of yacc.c */ -#line 3156 "cimXmlOps.y" +#line 3157 "cimXmlOps.y" { (yyval.xtokGetInstanceParms).instanceName = (yyvsp[(2) - (3)].xtokInstanceName); (yyval.xtokGetInstanceParms).flags = (yyval.xtokGetInstanceParms).flagsSet = 0 ; @@ -5816,7 +5822,7 @@ case 117: /* Line 1806 of yacc.c */ -#line 3164 "cimXmlOps.y" +#line 3165 "cimXmlOps.y" { (yyval.xtokGetInstanceParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_localOnly : 0 ; (yyval.xtokGetInstanceParms).flagsSet = FL_localOnly; @@ -5828,7 +5834,7 @@ case 118: /* Line 1806 of yacc.c */ -#line 3171 "cimXmlOps.y" +#line 3172 "cimXmlOps.y" { memset(&(yyval.xtokGetInstanceParms), 0, sizeof((yyval.xtokGetInstanceParms))); } @@ -5837,7 +5843,7 @@ case 119: /* Line 1806 of yacc.c */ -#line 3175 "cimXmlOps.y" +#line 3176 "cimXmlOps.y" { (yyval.xtokGetInstanceParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; (yyval.xtokGetInstanceParms).flagsSet = FL_includeQualifiers; @@ -5849,7 +5855,7 @@ case 120: /* Line 1806 of yacc.c */ -#line 3182 "cimXmlOps.y" +#line 3183 "cimXmlOps.y" { memset(&(yyval.xtokGetInstanceParms), 0, sizeof((yyval.xtokGetInstanceParms))); } @@ -5858,7 +5864,7 @@ case 121: /* Line 1806 of yacc.c */ -#line 3186 "cimXmlOps.y" +#line 3187 "cimXmlOps.y" { (yyval.xtokGetInstanceParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; (yyval.xtokGetInstanceParms).flagsSet = FL_includeClassOrigin; @@ -5870,7 +5876,7 @@ case 122: /* Line 1806 of yacc.c */ -#line 3193 "cimXmlOps.y" +#line 3194 "cimXmlOps.y" { memset(&(yyval.xtokGetInstanceParms), 0, sizeof((yyval.xtokGetInstanceParms))); } @@ -5879,7 +5885,7 @@ case 123: /* Line 1806 of yacc.c */ -#line 3197 "cimXmlOps.y" +#line 3198 "cimXmlOps.y" { (yyval.xtokGetInstanceParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokGetInstanceParms).properties=(yyvsp[(2) - (3)].xtokValueArray).next; @@ -5891,7 +5897,7 @@ case 124: /* Line 1806 of yacc.c */ -#line 3204 "cimXmlOps.y" +#line 3205 "cimXmlOps.y" { memset(&(yyval.xtokGetInstanceParms), 0, sizeof((yyval.xtokGetInstanceParms))); } @@ -5900,7 +5906,7 @@ case 125: /* Line 1806 of yacc.c */ -#line 3217 "cimXmlOps.y" +#line 3218 "cimXmlOps.y" { (yyval.xtokCreateClass).op.count = CC_REQ_REG_SEGMENTS; (yyval.xtokCreateClass).op.type = OPS_CreateClass; @@ -5916,7 +5922,7 @@ case 126: /* Line 1806 of yacc.c */ -#line 3228 "cimXmlOps.y" +#line 3229 "cimXmlOps.y" { (yyval.xtokCreateClass).op.count = CC_REQ_REG_SEGMENTS; (yyval.xtokCreateClass).op.type = OPS_CreateClass; @@ -5933,7 +5939,7 @@ case 127: /* Line 1806 of yacc.c */ -#line 3243 "cimXmlOps.y" +#line 3244 "cimXmlOps.y" { (yyval.xtokCreateClassParm).cls = (yyvsp[(2) - (3)].xtokClass); } @@ -5942,7 +5948,7 @@ case 128: /* Line 1806 of yacc.c */ -#line 3256 "cimXmlOps.y" +#line 3257 "cimXmlOps.y" { (yyval.xtokCreateInstance).op.count = CI_REQ_REG_SEGMENTS; (yyval.xtokCreateInstance).op.type = OPS_CreateInstance; @@ -5957,7 +5963,7 @@ case 129: /* Line 1806 of yacc.c */ -#line 3266 "cimXmlOps.y" +#line 3267 "cimXmlOps.y" { (yyval.xtokCreateInstance).op.count = CI_REQ_REG_SEGMENTS; (yyval.xtokCreateInstance).op.type = OPS_CreateInstance; @@ -5973,7 +5979,7 @@ case 130: /* Line 1806 of yacc.c */ -#line 3281 "cimXmlOps.y" +#line 3282 "cimXmlOps.y" { (yyval.xtokCreateInstanceParm).instance = (yyvsp[(2) - (3)].xtokInstance); } @@ -5982,7 +5988,7 @@ case 131: /* Line 1806 of yacc.c */ -#line 3293 "cimXmlOps.y" +#line 3294 "cimXmlOps.y" { (yyval.xtokModifyInstance).op.count = MI_REQ_REG_SEGMENTS; (yyval.xtokModifyInstance).op.type = OPS_ModifyInstance; @@ -5993,14 +5999,14 @@ (yyval.xtokModifyInstance).properties=0; setRequest(parm,&(yyval.xtokModifyInstance),sizeof(XtokModifyInstance),OPS_ModifyInstance); - if (buildModifyInstanceRequest(parm)) yyerror("Invalid Parameter"); + if (buildModifyInstanceRequest(parm)) yyerror(parm, "Invalid Parameter"); } break; case 132: /* Line 1806 of yacc.c */ -#line 3306 "cimXmlOps.y" +#line 3307 "cimXmlOps.y" { (yyval.xtokModifyInstance).op.count = MI_REQ_REG_SEGMENTS; (yyval.xtokModifyInstance).op.type = OPS_ModifyInstance; @@ -6012,14 +6018,14 @@ (yyval.xtokModifyInstance).properties=(yyvsp[(2) - (2)].xtokModifyInstanceParmsList).properties; setRequest(parm,&(yyval.xtokModifyInstance),sizeof(XtokModifyInstance),OPS_ModifyInstance); - if (buildModifyInstanceRequest(parm)) yyerror("Invalid Parameter"); + if (buildModifyInstanceRequest(parm)) yyerror(parm, "Invalid Parameter"); } break; case 133: /* Line 1806 of yacc.c */ -#line 3323 "cimXmlOps.y" +#line 3324 "cimXmlOps.y" { (yyval.xtokModifyInstanceParmsList).flags=(yyvsp[(1) - (1)].xtokModifyInstanceParms).flags; (yyval.xtokModifyInstanceParmsList).flagsSet=(yyvsp[(1) - (1)].xtokModifyInstanceParms).flagsSet; @@ -6035,7 +6041,7 @@ case 134: /* Line 1806 of yacc.c */ -#line 3334 "cimXmlOps.y" +#line 3335 "cimXmlOps.y" { (yyval.xtokModifyInstanceParmsList).flags=(yyvsp[(1) - (2)].xtokModifyInstanceParmsList).flags|(yyvsp[(2) - (2)].xtokModifyInstanceParms).flags; (yyval.xtokModifyInstanceParmsList).flagsSet=(yyvsp[(1) - (2)].xtokModifyInstanceParmsList).flagsSet|(yyvsp[(2) - (2)].xtokModifyInstanceParms).flagsSet; @@ -6051,7 +6057,7 @@ case 135: /* Line 1806 of yacc.c */ -#line 3349 "cimXmlOps.y" +#line 3350 "cimXmlOps.y" { (yyval.xtokModifyInstanceParms).namedInstance=(yyvsp[(2) - (3)].xtokNamedInstance); (yyval.xtokModifyInstanceParms).namedInstSet=1; @@ -6064,7 +6070,7 @@ case 136: /* Line 1806 of yacc.c */ -#line 3357 "cimXmlOps.y" +#line 3358 "cimXmlOps.y" { (yyval.xtokModifyInstanceParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; (yyval.xtokModifyInstanceParms).flagsSet = FL_includeQualifiers; @@ -6076,7 +6082,7 @@ case 137: /* Line 1806 of yacc.c */ -#line 3364 "cimXmlOps.y" +#line 3365 "cimXmlOps.y" { memset(&(yyval.xtokModifyInstanceParms), 0, sizeof((yyval.xtokModifyInstanceParms))); } @@ -6085,7 +6091,7 @@ case 138: /* Line 1806 of yacc.c */ -#line 3368 "cimXmlOps.y" +#line 3369 "cimXmlOps.y" { (yyval.xtokModifyInstanceParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokModifyInstanceParms).properties=(yyvsp[(2) - (3)].xtokValueArray).next; @@ -6097,7 +6103,7 @@ case 139: /* Line 1806 of yacc.c */ -#line 3375 "cimXmlOps.y" +#line 3376 "cimXmlOps.y" { memset(&(yyval.xtokModifyInstanceParms), 0, sizeof((yyval.xtokModifyInstanceParms))); } @@ -6106,7 +6112,7 @@ case 140: /* Line 1806 of yacc.c */ -#line 3387 "cimXmlOps.y" +#line 3388 "cimXmlOps.y" { (yyval.xtokDeleteClass).op.count = DC_REQ_REG_SEGMENTS; (yyval.xtokDeleteClass).op.type = OPS_DeleteClass; @@ -6121,7 +6127,7 @@ case 141: /* Line 1806 of yacc.c */ -#line 3397 "cimXmlOps.y" +#line 3398 "cimXmlOps.y" { (yyval.xtokDeleteClass).op.count = DC_REQ_REG_SEGMENTS; (yyval.xtokDeleteClass).op.type = OPS_DeleteClass; @@ -6137,7 +6143,7 @@ case 142: /* Line 1806 of yacc.c */ -#line 3412 "cimXmlOps.y" +#line 3413 "cimXmlOps.y" { (yyval.xtokDeleteClassParm).className = (yyvsp[(2) - (3)].className); } @@ -6146,7 +6152,7 @@ case 143: /* Line 1806 of yacc.c */ -#line 3424 "cimXmlOps.y" +#line 3425 "cimXmlOps.y" { (yyval.xtokDeleteInstance).op.count = DI_REQ_REG_SEGMENTS; (yyval.xtokDeleteInstance).op.type = OPS_DeleteInstance; @@ -6161,7 +6167,7 @@ case 144: /* Line 1806 of yacc.c */ -#line 3434 "cimXmlOps.y" +#line 3435 "cimXmlOps.y" { (yyval.xtokDeleteInstance).op.count = DI_REQ_REG_SEGMENTS; (yyval.xtokDeleteInstance).op.type = OPS_DeleteInstance; @@ -6177,7 +6183,7 @@ case 145: /* Line 1806 of yacc.c */ -#line 3449 "cimXmlOps.y" +#line 3450 "cimXmlOps.y" { (yyval.xtokDeleteInstanceParm).instanceName = (yyvsp[(2) - (3)].xtokInstanceName); } @@ -6186,7 +6192,7 @@ case 146: /* Line 1806 of yacc.c */ -#line 3462 "cimXmlOps.y" +#line 3463 "cimXmlOps.y" { (yyval.xtokEnumInstanceNames).op.count = EIN_REQ_REG_SEGMENTS; (yyval.xtokEnumInstanceNames).op.type = OPS_EnumerateInstanceNames; @@ -6201,7 +6207,7 @@ case 147: /* Line 1806 of yacc.c */ -#line 3481 "cimXmlOps.y" +#line 3482 "cimXmlOps.y" { (yyval.xtokEnumInstances).op.count = EI_REQ_REG_SEGMENTS; (yyval.xtokEnumInstances).op.type = OPS_EnumerateInstances; @@ -6219,7 +6225,7 @@ case 148: /* Line 1806 of yacc.c */ -#line 3494 "cimXmlOps.y" +#line 3495 "cimXmlOps.y" { (yyval.xtokEnumInstances).op.count = EI_REQ_REG_SEGMENTS; (yyval.xtokEnumInstances).op.type = OPS_EnumerateInstances; @@ -6237,7 +6243,7 @@ case 149: /* Line 1806 of yacc.c */ -#line 3510 "cimXmlOps.y" +#line 3511 "cimXmlOps.y" { (yyval.xtokEnumInstancesParmsList).flags=(yyvsp[(1) - (1)].xtokEnumInstancesParms).flags; (yyval.xtokEnumInstancesParmsList).flagsSet=(yyvsp[(1) - (1)].xtokEnumInstancesParms).flagsSet; @@ -6252,7 +6258,7 @@ case 150: /* Line 1806 of yacc.c */ -#line 3520 "cimXmlOps.y" +#line 3521 "cimXmlOps.y" { (yyval.xtokEnumInstancesParmsList).flags=(yyvsp[(1) - (2)].xtokEnumInstancesParmsList).flags|(yyvsp[(2) - (2)].xtokEnumInstancesParms).flags; (yyval.xtokEnumInstancesParmsList).flagsSet=(yyvsp[(1) - (2)].xtokEnumInstancesParmsList).flagsSet|(yyvsp[(2) - (2)].xtokEnumInstancesParms).flagsSet; @@ -6267,7 +6273,7 @@ case 151: /* Line 1806 of yacc.c */ -#line 3533 "cimXmlOps.y" +#line 3534 "cimXmlOps.y" { (yyval.xtokEnumInstancesParms).className = (yyvsp[(2) - (3)].className); (yyval.xtokEnumInstancesParms).flags = (yyval.xtokEnumInstancesParms).flagsSet = 0 ; @@ -6279,7 +6285,7 @@ case 152: /* Line 1806 of yacc.c */ -#line 3540 "cimXmlOps.y" +#line 3541 "cimXmlOps.y" { (yyval.xtokEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_localOnly : 0 ; (yyval.xtokEnumInstancesParms).flagsSet = FL_localOnly; @@ -6292,7 +6298,7 @@ case 153: /* Line 1806 of yacc.c */ -#line 3548 "cimXmlOps.y" +#line 3549 "cimXmlOps.y" { memset(&(yyval.xtokEnumInstancesParms), 0, sizeof((yyval.xtokEnumInstancesParms))); } @@ -6301,7 +6307,7 @@ case 154: /* Line 1806 of yacc.c */ -#line 3552 "cimXmlOps.y" +#line 3553 "cimXmlOps.y" { (yyval.xtokEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; (yyval.xtokEnumInstancesParms).flagsSet = FL_includeQualifiers; @@ -6314,7 +6320,7 @@ case 155: /* Line 1806 of yacc.c */ -#line 3560 "cimXmlOps.y" +#line 3561 "cimXmlOps.y" { memset(&(yyval.xtokEnumInstancesParms), 0, sizeof((yyval.xtokEnumInstancesParms))); } @@ -6323,7 +6329,7 @@ case 156: /* Line 1806 of yacc.c */ -#line 3564 "cimXmlOps.y" +#line 3565 "cimXmlOps.y" { (yyval.xtokEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_deepInheritance : 0 ; (yyval.xtokEnumInstancesParms).flagsSet = FL_deepInheritance; @@ -6336,7 +6342,7 @@ case 157: /* Line 1806 of yacc.c */ -#line 3572 "cimXmlOps.y" +#line 3573 "cimXmlOps.y" { memset(&(yyval.xtokEnumInstancesParms), 0, sizeof((yyval.xtokEnumInstancesParms))); } @@ -6345,7 +6351,7 @@ case 158: /* Line 1806 of yacc.c */ -#line 3576 "cimXmlOps.y" +#line 3577 "cimXmlOps.y" { (yyval.xtokEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; (yyval.xtokEnumInstancesParms).flagsSet = FL_includeClassOrigin; @@ -6358,7 +6364,7 @@ case 159: /* Line 1806 of yacc.c */ -#line 3584 "cimXmlOps.y" +#line 3585 "cimXmlOps.y" { memset(&(yyval.xtokEnumInstancesParms), 0, sizeof((yyval.xtokEnumInstancesParms))); } @@ -6367,7 +6373,7 @@ case 160: /* Line 1806 of yacc.c */ -#line 3588 "cimXmlOps.y" +#line 3589 "cimXmlOps.y" { (yyval.xtokEnumInstancesParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokEnumInstancesParms).properties=(yyvsp[(2) - (3)].xtokValueArray).next; @@ -6379,7 +6385,7 @@ case 161: /* Line 1806 of yacc.c */ -#line 3595 "cimXmlOps.y" +#line 3596 "cimXmlOps.y" { memset(&(yyval.xtokEnumInstancesParms), 0, sizeof((yyval.xtokEnumInstancesParms))); } @@ -6388,7 +6394,7 @@ case 162: /* Line 1806 of yacc.c */ -#line 3611 "cimXmlOps.y" +#line 3612 "cimXmlOps.y" { (yyval.xtokExecQuery).op.count = EQ_REQ_REG_SEGMENTS; (yyval.xtokExecQuery).op.type = OPS_ExecQuery; @@ -6404,7 +6410,7 @@ case 163: /* Line 1806 of yacc.c */ -#line 3624 "cimXmlOps.y" +#line 3625 "cimXmlOps.y" { (yyval.xtokExecQuery).op.count = EQ_REQ_REG_SEGMENTS; (yyval.xtokExecQuery).op.type = OPS_ExecQuery; @@ -6420,7 +6426,7 @@ case 164: /* Line 1806 of yacc.c */ -#line 3644 "cimXmlOps.y" +#line 3645 "cimXmlOps.y" { (yyval.xtokAssociators).op.count = AI_REQ_REG_SEGMENTS; (yyval.xtokAssociators).op.type = OPS_Associators; @@ -6443,7 +6449,7 @@ case 165: /* Line 1806 of yacc.c */ -#line 3662 "cimXmlOps.y" +#line 3663 "cimXmlOps.y" { (yyval.xtokAssociators).op.count = AI_REQ_REG_SEGMENTS; (yyval.xtokAssociators).op.type = OPS_Associators; @@ -6467,7 +6473,7 @@ case 166: /* Line 1806 of yacc.c */ -#line 3684 "cimXmlOps.y" +#line 3685 "cimXmlOps.y" { (yyval.xtokAssociatorsParmsList).flags=(yyvsp[(1) - (1)].xtokAssociatorsParms).flags; (yyval.xtokAssociatorsParmsList).flagsSet=(yyvsp[(1) - (1)].xtokAssociatorsParms).flagsSet; @@ -6489,7 +6495,7 @@ case 167: /* Line 1806 of yacc.c */ -#line 3701 "cimXmlOps.y" +#line 3702 "cimXmlOps.y" { (yyval.xtokAssociatorsParmsList).flags=(yyvsp[(1) - (2)].xtokAssociatorsParmsList).flags|(yyvsp[(2) - (2)].xtokAssociatorsParms).flags; (yyval.xtokAssociatorsParmsList).flagsSet=(yyvsp[(1) - (2)].xtokAssociatorsParmsList).flagsSet|(yyvsp[(2) - (2)].xtokAssociatorsParms).flagsSet; @@ -6511,7 +6517,7 @@ case 168: /* Line 1806 of yacc.c */ -#line 3721 "cimXmlOps.y" +#line 3722 "cimXmlOps.y" { (yyval.xtokAssociatorsParms).objectName = (yyvsp[(2) - (3)].xtokInstanceName); (yyval.xtokAssociatorsParms).objNameSet = 1; @@ -6525,7 +6531,7 @@ case 169: /* Line 1806 of yacc.c */ -#line 3730 "cimXmlOps.y" +#line 3731 "cimXmlOps.y" { // This is an unsupported operation. To ensure we handle with a friendly // error message, make it appear as if INSTANCENAME with no KEYBINDING @@ -6544,7 +6550,7 @@ case 170: /* Line 1806 of yacc.c */ -#line 3744 "cimXmlOps.y" +#line 3745 "cimXmlOps.y" { (yyval.xtokAssociatorsParms).assocClass = (yyvsp[(2) - (3)].className); (yyval.xtokAssociatorsParms).objNameSet=(yyval.xtokAssociatorsParms).flags = (yyval.xtokAssociatorsParms).flagsSet = 0 ; @@ -6557,7 +6563,7 @@ case 171: /* Line 1806 of yacc.c */ -#line 3752 "cimXmlOps.y" +#line 3753 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorsParms), 0, sizeof((yyval.xtokAssociatorsParms))); } @@ -6566,7 +6572,7 @@ case 172: /* Line 1806 of yacc.c */ -#line 3756 "cimXmlOps.y" +#line 3757 "cimXmlOps.y" { (yyval.xtokAssociatorsParms).resultClass = (yyvsp[(2) - (3)].className); (yyval.xtokAssociatorsParms).objNameSet=(yyval.xtokAssociatorsParms).flags = (yyval.xtokAssociatorsParms).flagsSet = 0 ; @@ -6579,7 +6585,7 @@ case 173: /* Line 1806 of yacc.c */ -#line 3764 "cimXmlOps.y" +#line 3765 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorsParms), 0, sizeof((yyval.xtokAssociatorsParms))); } @@ -6588,7 +6594,7 @@ case 174: /* Line 1806 of yacc.c */ -#line 3768 "cimXmlOps.y" +#line 3769 "cimXmlOps.y" { (yyval.xtokAssociatorsParms).role = (yyvsp[(2) - (3)].xtokValue).value; (yyval.xtokAssociatorsParms).objNameSet=(yyval.xtokAssociatorsParms).flags = (yyval.xtokAssociatorsParms).flagsSet = 0 ; @@ -6601,7 +6607,7 @@ case 175: /* Line 1806 of yacc.c */ -#line 3776 "cimXmlOps.y" +#line 3777 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorsParms), 0, sizeof((yyval.xtokAssociatorsParms))); } @@ -6610,7 +6616,7 @@ case 176: /* Line 1806 of yacc.c */ -#line 3780 "cimXmlOps.y" +#line 3781 "cimXmlOps.y" { (yyval.xtokAssociatorsParms).resultRole = (yyvsp[(2) - (3)].xtokValue).value; (yyval.xtokAssociatorsParms).objNameSet=(yyval.xtokAssociatorsParms).flags = (yyval.xtokAssociatorsParms).flagsSet = 0 ; @@ -6623,7 +6629,7 @@ case 177: /* Line 1806 of yacc.c */ -#line 3788 "cimXmlOps.y" +#line 3789 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorsParms), 0, sizeof((yyval.xtokAssociatorsParms))); } @@ -6632,7 +6638,7 @@ case 178: /* Line 1806 of yacc.c */ -#line 3792 "cimXmlOps.y" +#line 3793 "cimXmlOps.y" { (yyval.xtokAssociatorsParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; (yyval.xtokAssociatorsParms).flagsSet = FL_includeQualifiers; @@ -6646,7 +6652,7 @@ case 179: /* Line 1806 of yacc.c */ -#line 3801 "cimXmlOps.y" +#line 3802 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorsParms), 0, sizeof((yyval.xtokAssociatorsParms))); } @@ -6655,7 +6661,7 @@ case 180: /* Line 1806 of yacc.c */ -#line 3805 "cimXmlOps.y" +#line 3806 "cimXmlOps.y" { (yyval.xtokAssociatorsParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; (yyval.xtokAssociatorsParms).flagsSet = FL_includeClassOrigin; @@ -6669,7 +6675,7 @@ case 181: /* Line 1806 of yacc.c */ -#line 3814 "cimXmlOps.y" +#line 3815 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorsParms), 0, sizeof((yyval.xtokAssociatorsParms))); } @@ -6678,7 +6684,7 @@ case 182: /* Line 1806 of yacc.c */ -#line 3818 "cimXmlOps.y" +#line 3819 "cimXmlOps.y" { (yyval.xtokAssociatorsParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokAssociatorsParms).properties=(yyvsp[(2) - (3)].xtokValueArray).next; @@ -6690,7 +6696,7 @@ case 183: /* Line 1806 of yacc.c */ -#line 3825 "cimXmlOps.y" +#line 3826 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorsParms), 0, sizeof((yyval.xtokAssociatorsParms))); } @@ -6699,7 +6705,7 @@ case 184: /* Line 1806 of yacc.c */ -#line 3840 "cimXmlOps.y" +#line 3841 "cimXmlOps.y" { (yyval.xtokReferences).op.count = RI_REQ_REG_SEGMENTS; (yyval.xtokReferences).op.type = OPS_References; @@ -6720,7 +6726,7 @@ case 185: /* Line 1806 of yacc.c */ -#line 3856 "cimXmlOps.y" +#line 3857 "cimXmlOps.y" { (yyval.xtokReferences).op.count = RI_REQ_REG_SEGMENTS; (yyval.xtokReferences).op.type = OPS_References; @@ -6742,7 +6748,7 @@ case 186: /* Line 1806 of yacc.c */ -#line 3876 "cimXmlOps.y" +#line 3877 "cimXmlOps.y" { (yyval.xtokReferencesParmsList).flags=(yyvsp[(1) - (1)].xtokReferencesParms).flags; (yyval.xtokReferencesParmsList).flagsSet=(yyvsp[(1) - (1)].xtokReferencesParms).flagsSet; @@ -6762,7 +6768,7 @@ case 187: /* Line 1806 of yacc.c */ -#line 3891 "cimXmlOps.y" +#line 3892 "cimXmlOps.y" { (yyval.xtokReferencesParmsList).flags=(yyvsp[(1) - (2)].xtokReferencesParmsList).flags|(yyvsp[(2) - (2)].xtokReferencesParms).flags; (yyval.xtokReferencesParmsList).flagsSet=(yyvsp[(1) - (2)].xtokReferencesParmsList).flagsSet|(yyvsp[(2) - (2)].xtokReferencesParms).flagsSet; @@ -6782,7 +6788,7 @@ case 188: /* Line 1806 of yacc.c */ -#line 3909 "cimXmlOps.y" +#line 3910 "cimXmlOps.y" { (yyval.xtokReferencesParms).objectName = (yyvsp[(2) - (3)].xtokInstanceName); (yyval.xtokReferencesParms).objNameSet = 1; @@ -6796,7 +6802,7 @@ case 189: /* Line 1806 of yacc.c */ -#line 3918 "cimXmlOps.y" +#line 3919 "cimXmlOps.y" { (yyval.xtokReferencesParms).objectName.className = (yyvsp[(2) - (3)].className); (yyval.xtokReferencesParms).objectName.bindings.next=0; @@ -6812,7 +6818,7 @@ case 190: /* Line 1806 of yacc.c */ -#line 3929 "cimXmlOps.y" +#line 3930 "cimXmlOps.y" { (yyval.xtokReferencesParms).resultClass = (yyvsp[(2) - (3)].className); (yyval.xtokReferencesParms).objNameSet=(yyval.xtokReferencesParms).flags = (yyval.xtokReferencesParms).flagsSet = 0 ; @@ -6825,7 +6831,7 @@ case 191: /* Line 1806 of yacc.c */ -#line 3937 "cimXmlOps.y" +#line 3938 "cimXmlOps.y" { memset(&(yyval.xtokReferencesParms), 0, sizeof((yyval.xtokReferencesParms))); } @@ -6834,7 +6840,7 @@ case 192: /* Line 1806 of yacc.c */ -#line 3941 "cimXmlOps.y" +#line 3942 "cimXmlOps.y" { (yyval.xtokReferencesParms).role = (yyvsp[(2) - (3)].xtokValue).value; (yyval.xtokReferencesParms).objNameSet=(yyval.xtokReferencesParms).flags = (yyval.xtokReferencesParms).flagsSet = 0 ; @@ -6847,7 +6853,7 @@ case 193: /* Line 1806 of yacc.c */ -#line 3949 "cimXmlOps.y" +#line 3950 "cimXmlOps.y" { memset(&(yyval.xtokReferencesParms), 0, sizeof((yyval.xtokReferencesParms))); } @@ -6856,7 +6862,7 @@ case 194: /* Line 1806 of yacc.c */ -#line 3953 "cimXmlOps.y" +#line 3954 "cimXmlOps.y" { (yyval.xtokReferencesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; (yyval.xtokReferencesParms).flagsSet = FL_includeQualifiers; @@ -6870,7 +6876,7 @@ case 195: /* Line 1806 of yacc.c */ -#line 3962 "cimXmlOps.y" +#line 3963 "cimXmlOps.y" { memset(&(yyval.xtokReferencesParms), 0, sizeof((yyval.xtokReferencesParms))); } @@ -6879,7 +6885,7 @@ case 196: /* Line 1806 of yacc.c */ -#line 3966 "cimXmlOps.y" +#line 3967 "cimXmlOps.y" { (yyval.xtokReferencesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; (yyval.xtokReferencesParms).flagsSet = FL_includeClassOrigin; @@ -6893,7 +6899,7 @@ case 197: /* Line 1806 of yacc.c */ -#line 3975 "cimXmlOps.y" +#line 3976 "cimXmlOps.y" { memset(&(yyval.xtokReferencesParms), 0, sizeof((yyval.xtokReferencesParms))); } @@ -6902,7 +6908,7 @@ case 198: /* Line 1806 of yacc.c */ -#line 3979 "cimXmlOps.y" +#line 3980 "cimXmlOps.y" { (yyval.xtokReferencesParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokReferencesParms).properties=(yyvsp[(2) - (3)].xtokValueArray).next; @@ -6914,7 +6920,7 @@ case 199: /* Line 1806 of yacc.c */ -#line 3986 "cimXmlOps.y" +#line 3987 "cimXmlOps.y" { memset(&(yyval.xtokReferencesParms), 0, sizeof((yyval.xtokReferencesParms))); } @@ -6923,7 +6929,7 @@ case 200: /* Line 1806 of yacc.c */ -#line 3999 "cimXmlOps.y" +#line 4000 "cimXmlOps.y" { (yyval.xtokAssociatorNames).op.count = AIN_REQ_REG_SEGMENTS; (yyval.xtokAssociatorNames).op.type = OPS_AssociatorNames; @@ -6943,7 +6949,7 @@ case 201: /* Line 1806 of yacc.c */ -#line 4014 "cimXmlOps.y" +#line 4015 "cimXmlOps.y" { (yyval.xtokAssociatorNames).op.count = AIN_REQ_REG_SEGMENTS; (yyval.xtokAssociatorNames).op.type = OPS_AssociatorNames; @@ -6963,7 +6969,7 @@ case 202: /* Line 1806 of yacc.c */ -#line 4032 "cimXmlOps.y" +#line 4033 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokAssociatorNamesParms).objNameSet) { (yyval.xtokAssociatorNamesParmsList).objectName=(yyvsp[(1) - (1)].xtokAssociatorNamesParms).objectName; @@ -6979,7 +6985,7 @@ case 203: /* Line 1806 of yacc.c */ -#line 4043 "cimXmlOps.y" +#line 4044 "cimXmlOps.y" { if ((yyvsp[(2) - (2)].xtokAssociatorNamesParms).assocClass) (yyval.xtokAssociatorNamesParmsList).assocClass=(yyvsp[(2) - (2)].xtokAssociatorNamesParms).assocClass; else if ((yyvsp[(2) - (2)].xtokAssociatorNamesParms).resultClass) (yyval.xtokAssociatorNamesParmsList).resultClass=(yyvsp[(2) - (2)].xtokAssociatorNamesParms).resultClass; @@ -6995,7 +7001,7 @@ case 204: /* Line 1806 of yacc.c */ -#line 4057 "cimXmlOps.y" +#line 4058 "cimXmlOps.y" { (yyval.xtokAssociatorNamesParms).objectName = (yyvsp[(2) - (3)].xtokInstanceName); (yyval.xtokAssociatorNamesParms).objNameSet = 1; @@ -7006,7 +7012,7 @@ case 205: /* Line 1806 of yacc.c */ -#line 4063 "cimXmlOps.y" +#line 4064 "cimXmlOps.y" { (yyval.xtokAssociatorNamesParms).objectName.className = (yyvsp[(2) - (3)].className); (yyval.xtokAssociatorNamesParms).objectName.bindings.next=0; @@ -7019,7 +7025,7 @@ case 206: /* Line 1806 of yacc.c */ -#line 4071 "cimXmlOps.y" +#line 4072 "cimXmlOps.y" { (yyval.xtokAssociatorNamesParms).assocClass = (yyvsp[(2) - (3)].className); (yyval.xtokAssociatorNamesParms).objNameSet = 0 ; @@ -7030,7 +7036,7 @@ case 207: /* Line 1806 of yacc.c */ -#line 4077 "cimXmlOps.y" +#line 4078 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorNamesParms), 0, sizeof((yyval.xtokAssociatorNamesParms))); } @@ -7039,7 +7045,7 @@ case 208: /* Line 1806 of yacc.c */ -#line 4081 "cimXmlOps.y" +#line 4082 "cimXmlOps.y" { (yyval.xtokAssociatorNamesParms).resultClass = (yyvsp[(2) - (3)].className); (yyval.xtokAssociatorNamesParms).objNameSet = 0 ; @@ -7050,7 +7056,7 @@ case 209: /* Line 1806 of yacc.c */ -#line 4087 "cimXmlOps.y" +#line 4088 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorNamesParms), 0, sizeof((yyval.xtokAssociatorNamesParms))); } @@ -7059,7 +7065,7 @@ case 210: /* Line 1806 of yacc.c */ -#line 4091 "cimXmlOps.y" +#line 4092 "cimXmlOps.y" { (yyval.xtokAssociatorNamesParms).role = (yyvsp[(2) - (3)].xtokValue).value; (yyval.xtokAssociatorNamesParms).objNameSet = 0 ; @@ -7070,7 +7076,7 @@ case 211: /* Line 1806 of yacc.c */ -#line 4097 "cimXmlOps.y" +#line 4098 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorNamesParms), 0, sizeof((yyval.xtokAssociatorNamesParms))); } @@ -7079,7 +7085,7 @@ case 212: /* Line 1806 of yacc.c */ -#line 4101 "cimXmlOps.y" +#line 4102 "cimXmlOps.y" { (yyval.xtokAssociatorNamesParms).resultRole = (yyvsp[(2) - (3)].xtokValue).value; (yyval.xtokAssociatorNamesParms).objNameSet= 0 ; @@ -7090,7 +7096,7 @@ case 213: /* Line 1806 of yacc.c */ -#line 4107 "cimXmlOps.y" +#line 4108 "cimXmlOps.y" { memset(&(yyval.xtokAssociatorNamesParms), 0, sizeof((yyval.xtokAssociatorNamesParms))); } @@ -7099,7 +7105,7 @@ case 214: /* Line 1806 of yacc.c */ -#line 4121 "cimXmlOps.y" +#line 4122 "cimXmlOps.y" { (yyval.xtokReferenceNames).op.count = RIN_REQ_REG_SEGMENTS; (yyval.xtokReferenceNames).op.type = OPS_ReferenceNames; @@ -7117,7 +7123,7 @@ case 215: /* Line 1806 of yacc.c */ -#line 4134 "cimXmlOps.y" +#line 4135 "cimXmlOps.y" { (yyval.xtokReferenceNames).op.count = RIN_REQ_REG_SEGMENTS; (yyval.xtokReferenceNames).op.type = OPS_ReferenceNames; @@ -7136,7 +7142,7 @@ case 216: /* Line 1806 of yacc.c */ -#line 4151 "cimXmlOps.y" +#line 4152 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokReferenceNamesParms).objNameSet) { (yyval.xtokReferenceNamesParmsList).objectName=(yyvsp[(1) - (1)].xtokReferenceNamesParms).objectName; @@ -7150,7 +7156,7 @@ case 217: /* Line 1806 of yacc.c */ -#line 4160 "cimXmlOps.y" +#line 4161 "cimXmlOps.y" { if((yyvsp[(2) - (2)].xtokReferenceNamesParms).objNameSet) { (yyval.xtokReferenceNamesParmsList).objectName=(yyvsp[(2) - (2)].xtokReferenceNamesParms).objectName; @@ -7164,7 +7170,7 @@ case 218: /* Line 1806 of yacc.c */ -#line 4172 "cimXmlOps.y" +#line 4173 "cimXmlOps.y" { (yyval.xtokReferenceNamesParms).objectName = (yyvsp[(2) - (3)].xtokInstanceName); (yyval.xtokReferenceNamesParms).objNameSet = 1; @@ -7175,7 +7181,7 @@ case 219: /* Line 1806 of yacc.c */ -#line 4178 "cimXmlOps.y" +#line 4179 "cimXmlOps.y" { (yyval.xtokReferenceNamesParms).objectName.className = (yyvsp[(2) - (3)].className); (yyval.xtokReferenceNamesParms).objectName.bindings.next=0; @@ -7188,7 +7194,7 @@ case 220: /* Line 1806 of yacc.c */ -#line 4186 "cimXmlOps.y" +#line 4187 "cimXmlOps.y" { (yyval.xtokReferenceNamesParms).resultClass = (yyvsp[(2) - (3)].className); (yyval.xtokReferenceNamesParms).objNameSet = 0; @@ -7199,7 +7205,7 @@ case 221: /* Line 1806 of yacc.c */ -#line 4192 "cimXmlOps.y" +#line 4193 "cimXmlOps.y" { memset(&(yyval.xtokReferenceNamesParms), 0, sizeof((yyval.xtokReferenceNamesParms))); } @@ -7208,7 +7214,7 @@ case 222: /* Line 1806 of yacc.c */ -#line 4196 "cimXmlOps.y" +#line 4197 "cimXmlOps.y" { (yyval.xtokReferenceNamesParms).role = (yyvsp[(2) - (3)].xtokValue).value; (yyval.xtokReferenceNamesParms).objNameSet = 0 ; @@ -7219,7 +7225,7 @@ case 223: /* Line 1806 of yacc.c */ -#line 4202 "cimXmlOps.y" +#line 4203 "cimXmlOps.y" { memset(&(yyval.xtokReferenceNamesParms), 0, sizeof((yyval.xtokReferenceNamesParms))); } @@ -7228,7 +7234,7 @@ case 224: /* Line 1806 of yacc.c */ -#line 4214 "cimXmlOps.y" +#line 4215 "cimXmlOps.y" { (yyval.xtokNamedInstance).path=(yyvsp[(2) - (4)].xtokInstanceName); (yyval.xtokNamedInstance).instance=(yyvsp[(3) - (4)].xtokInstance); @@ -7238,7 +7244,7 @@ case 225: /* Line 1806 of yacc.c */ -#line 4227 "cimXmlOps.y" +#line 4228 "cimXmlOps.y" { if (((ParserControl*)parm)->Qs) (yyval.xtokClass).qualifiers=((ParserControl*)parm)->qualifiers; @@ -7255,14 +7261,14 @@ case 226: /* Line 1806 of yacc.c */ -#line 4241 "cimXmlOps.y" +#line 4242 "cimXmlOps.y" {;} break; case 227: /* Line 1806 of yacc.c */ -#line 4243 "cimXmlOps.y" +#line 4244 "cimXmlOps.y" { ((ParserControl*)parm)->Qs++; addQualifier(&(((ParserControl*)parm)->qualifiers),&(yyvsp[(2) - (2)].xtokQualifier)); @@ -7272,7 +7278,7 @@ case 228: /* Line 1806 of yacc.c */ -#line 4247 "cimXmlOps.y" +#line 4248 "cimXmlOps.y" { ((ParserControl*)parm)->Ps++; addProperty(&(((ParserControl*)parm)->properties),&(yyvsp[(2) - (2)].xtokProperty)); @@ -7282,7 +7288,7 @@ case 229: /* Line 1806 of yacc.c */ -#line 4251 "cimXmlOps.y" +#line 4252 "cimXmlOps.y" { ((ParserControl*)parm)->Ms++; addMethod(&(((ParserControl*)parm)->methods),&(yyvsp[(2) - (2)].xtokMethod)); @@ -7292,7 +7298,7 @@ case 230: /* Line 1806 of yacc.c */ -#line 4259 "cimXmlOps.y" +#line 4260 "cimXmlOps.y" { if (((ParserControl*)parm)->MQs) (yyval.xtokMethod).qualifiers=(yyvsp[(2) - (3)].xtokMethodData).qualifiers; @@ -7309,14 +7315,14 @@ case 231: /* Line 1806 of yacc.c */ -#line 4273 "cimXmlOps.y" +#line 4274 "cimXmlOps.y" {;} break; case 232: /* Line 1806 of yacc.c */ -#line 4275 "cimXmlOps.y" +#line 4276 "cimXmlOps.y" { if (((ParserControl*)parm)->MQs==0) memset(&(yyval.xtokMethodData).qualifiers,0,sizeof((yyval.xtokMethodData).qualifiers)); @@ -7328,7 +7334,7 @@ case 233: /* Line 1806 of yacc.c */ -#line 4282 "cimXmlOps.y" +#line 4283 "cimXmlOps.y" { if (((ParserControl*)parm)->MPs==0) memset(&(yyval.xtokMethodData).params,0,sizeof((yyval.xtokMethodData).params)); @@ -7344,14 +7350,14 @@ case 234: /* Line 1806 of yacc.c */ -#line 4295 "cimXmlOps.y" +#line 4296 "cimXmlOps.y" {;} break; case 235: /* Line 1806 of yacc.c */ -#line 4297 "cimXmlOps.y" +#line 4298 "cimXmlOps.y" { if (((ParserControl*)parm)->MPQs==0) memset(&(yyval.xtokParam).qualifiers,0,sizeof((yyval.xtokParam).qualifiers)); @@ -7363,7 +7369,7 @@ case 236: /* Line 1806 of yacc.c */ -#line 4312 "cimXmlOps.y" +#line 4313 "cimXmlOps.y" { if((yyvsp[(2) - (3)].xtokInstanceData).qualifiers.first) (yyval.xtokInstance).qualifiers=(yyvsp[(2) - (3)].xtokInstanceData).qualifiers; @@ -7378,7 +7384,7 @@ case 237: /* Line 1806 of yacc.c */ -#line 4325 "cimXmlOps.y" +#line 4326 "cimXmlOps.y" { (yyval.xtokInstanceData).properties.last=0; (yyval.xtokInstanceData).properties.first=0; @@ -7390,7 +7396,7 @@ case 238: /* Line 1806 of yacc.c */ -#line 4332 "cimXmlOps.y" +#line 4333 "cimXmlOps.y" { addQualifier(&((yyval.xtokInstanceData).qualifiers),&(yyvsp[(2) - (2)].xtokQualifier)); } @@ -7399,7 +7405,7 @@ case 239: /* Line 1806 of yacc.c */ -#line 4336 "cimXmlOps.y" +#line 4337 "cimXmlOps.y" { addProperty(&((yyval.xtokInstanceData).properties),&(yyvsp[(2) - (2)].xtokProperty)); } @@ -7408,14 +7414,14 @@ case 240: /* Line 1806 of yacc.c */ -#line 4346 "cimXmlOps.y" +#line 4347 "cimXmlOps.y" {;} break; case 241: /* Line 1806 of yacc.c */ -#line 4348 "cimXmlOps.y" +#line 4349 "cimXmlOps.y" { (yyval.xtokQualifierDeclaration).scope = (yyvsp[(2) - (4)].xtokScope); (yyval.xtokQualifierDeclaration).data = (yyvsp[(3) - (4)].xtokQualifierDeclarationData); @@ -7425,7 +7431,7 @@ case 242: /* Line 1806 of yacc.c */ -#line 4356 "cimXmlOps.y" +#line 4357 "cimXmlOps.y" { (yyval.xtokQualifierDeclarationData).value.value = NULL; } @@ -7434,7 +7440,7 @@ case 243: /* Line 1806 of yacc.c */ -#line 4360 "cimXmlOps.y" +#line 4361 "cimXmlOps.y" { (yyval.xtokQualifierDeclarationData).value = (yyvsp[(1) - (1)].xtokValue); (yyval.xtokQualifierDeclarationData).type = 0; @@ -7444,7 +7450,7 @@ case 244: /* Line 1806 of yacc.c */ -#line 4365 "cimXmlOps.y" +#line 4366 "cimXmlOps.y" { (yyval.xtokQualifierDeclarationData).valueArray=(yyvsp[(1) - (1)].xtokValueArray); (yyval.xtokQualifierDeclarationData).type=CMPI_ARRAY; @@ -7454,14 +7460,14 @@ case 245: /* Line 1806 of yacc.c */ -#line 4375 "cimXmlOps.y" +#line 4376 "cimXmlOps.y" {;} break; case 246: /* Line 1806 of yacc.c */ -#line 4377 "cimXmlOps.y" +#line 4378 "cimXmlOps.y" { } break; @@ -7469,7 +7475,7 @@ case 247: /* Line 1806 of yacc.c */ -#line 4387 "cimXmlOps.y" +#line 4388 "cimXmlOps.y" { (yyvsp[(3) - (4)].xtokPropertyData).qualifiers=(yyvsp[(2) - (4)].xtokQualifiers); (yyval.xtokProperty).val=(yyvsp[(3) - (4)].xtokPropertyData); @@ -7486,7 +7492,7 @@ case 248: /* Line 1806 of yacc.c */ -#line 4399 "cimXmlOps.y" +#line 4400 "cimXmlOps.y" { (yyvsp[(3) - (4)].xtokPropertyData).qualifiers=(yyvsp[(2) - (4)].xtokQualifiers); (yyval.xtokProperty).val=(yyvsp[(3) - (4)].xtokPropertyData); @@ -7496,7 +7502,7 @@ case 249: /* Line 1806 of yacc.c */ -#line 4404 "cimXmlOps.y" +#line 4405 "cimXmlOps.y" { (yyvsp[(3) - (4)].xtokPropertyData).qualifiers=(yyvsp[(2) - (4)].xtokQualifiers); (yyval.xtokProperty).val=(yyvsp[(3) - (4)].xtokPropertyData); @@ -7513,7 +7519,7 @@ case 250: /* Line 1806 of yacc.c */ -#line 4419 "cimXmlOps.y" +#line 4420 "cimXmlOps.y" { (yyval.xtokQualifiers).first = (yyval.xtokQualifiers).last = NULL; } @@ -7522,7 +7528,7 @@ case 251: /* Line 1806 of yacc.c */ -#line 4423 "cimXmlOps.y" +#line 4424 "cimXmlOps.y" { addQualifier(&(yyvsp[(1) - (2)].xtokQualifiers),&(yyvsp[(2) - (2)].xtokQualifier)); (yyval.xtokQualifiers) = (yyvsp[(1) - (2)].xtokQualifiers); @@ -7532,7 +7538,7 @@ case 252: /* Line 1806 of yacc.c */ -#line 4431 "cimXmlOps.y" +#line 4432 "cimXmlOps.y" { (yyval.xtokPropertyData).val.value = NULL; (yyval.xtokPropertyData).list.values = NULL; @@ -7543,7 +7549,7 @@ case 253: /* Line 1806 of yacc.c */ -#line 4437 "cimXmlOps.y" +#line 4438 "cimXmlOps.y" { (yyval.xtokPropertyData).val=(yyvsp[(1) - (1)].xtokValue); } @@ -7552,7 +7558,7 @@ case 254: /* Line 1806 of yacc.c */ -#line 4441 "cimXmlOps.y" +#line 4442 "cimXmlOps.y" { (yyval.xtokPropertyData).ref=(yyvsp[(1) - (1)].xtokValueReference); } @@ -7561,7 +7567,7 @@ case 255: /* Line 1806 of yacc.c */ -#line 4445 "cimXmlOps.y" +#line 4446 "cimXmlOps.y" { (yyval.xtokPropertyData).list=(yyvsp[(1) - (1)].xtokValueArray); } @@ -7570,7 +7576,7 @@ case 256: /* Line 1806 of yacc.c */ -#line 4458 "cimXmlOps.y" +#line 4459 "cimXmlOps.y" { (yyval.xtokQualifier).value=(yyvsp[(2) - (3)].xtokValue); } @@ -7579,7 +7585,7 @@ case 257: /* Line 1806 of yacc.c */ -#line 4462 "cimXmlOps.y" +#line 4463 "cimXmlOps.y" { (yyval.xtokQualifier).valueArray=(yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokQualifier).type |= CMPI_ARRAY; @@ -7589,7 +7595,7 @@ case 258: /* Line 1806 of yacc.c */ -#line 4476 "cimXmlOps.y" +#line 4477 "cimXmlOps.y" { (yyval.xtokLocalNameSpacePath)=(yyvsp[(2) - (3)].xtokNameSpace).cns; } @@ -7598,7 +7604,7 @@ case 259: /* Line 1806 of yacc.c */ -#line 4483 "cimXmlOps.y" +#line 4484 "cimXmlOps.y" { (yyval.xtokNameSpace).cns=strdup((yyvsp[(1) - (2)].xtokNameSpace).ns); } @@ -7607,7 +7613,7 @@ case 260: /* Line 1806 of yacc.c */ -#line 4487 "cimXmlOps.y" +#line 4488 "cimXmlOps.y" { int l=strlen((yyvsp[(1) - (3)].xtokNameSpace).cns)+strlen((yyvsp[(2) - (3)].xtokNameSpace).ns)+2; (yyval.xtokNameSpace).cns=malloc(l); @@ -7621,7 +7627,7 @@ case 261: /* Line 1806 of yacc.c */ -#line 4500 "cimXmlOps.y" +#line 4501 "cimXmlOps.y" { (yyval.xtokNameSpacePath).host=(yyvsp[(2) - (4)].xtokHost); (yyval.xtokNameSpacePath).nameSpacePath=(yyvsp[(3) - (4)].xtokLocalNameSpacePath); @@ -7631,7 +7637,7 @@ case 262: /* Line 1806 of yacc.c */ -#line 4508 "cimXmlOps.y" +#line 4509 "cimXmlOps.y" { } break; @@ -7639,7 +7645,7 @@ case 263: /* Line 1806 of yacc.c */ -#line 4514 "cimXmlOps.y" +#line 4515 "cimXmlOps.y" { (yyval.xtokInstancePath).path=(yyvsp[(2) - (4)].xtokNameSpacePath); (yyval.xtokInstancePath).instanceName=(yyvsp[(3) - (4)].xtokInstanceName); @@ -7650,7 +7656,7 @@ case 264: /* Line 1806 of yacc.c */ -#line 4533 "cimXmlOps.y" +#line 4534 "cimXmlOps.y" { (yyval.xtokLocalInstancePath).path=(yyvsp[(2) - (4)].xtokLocalNameSpacePath); (yyval.xtokLocalInstancePath).instanceName=(yyvsp[(3) - (4)].xtokInstanceName); @@ -7661,7 +7667,7 @@ case 265: /* Line 1806 of yacc.c */ -#line 4542 "cimXmlOps.y" +#line 4543 "cimXmlOps.y" { (yyval.xtokLocalClassPath).path=(yyvsp[(2) - (4)].xtokLocalNameSpacePath); (yyval.xtokLocalClassPath).className=(yyvsp[(3) - (4)].className); @@ -7672,7 +7678,7 @@ case 266: /* Line 1806 of yacc.c */ -#line 4555 "cimXmlOps.y" +#line 4556 "cimXmlOps.y" { (yyval.xtokValue).instance = malloc(sizeof(XtokInstance)); (yyval.xtokValue).instance = memcpy((yyval.xtokValue).instance, &(yyvsp[(2) - (3)].xtokInstance), sizeof(XtokInstance)); @@ -7683,7 +7689,7 @@ case 267: /* Line 1806 of yacc.c */ -#line 4561 "cimXmlOps.y" +#line 4562 "cimXmlOps.y" { (yyval.xtokValue).instance = malloc(sizeof(XtokInstance)); (yyval.xtokValue).instance = memcpy((yyval.xtokValue).instance, &(yyvsp[(3) - (5)].xtokInstance), sizeof(XtokInstance)); @@ -7694,7 +7700,7 @@ case 268: /* Line 1806 of yacc.c */ -#line 4567 "cimXmlOps.y" +#line 4568 "cimXmlOps.y" { (yyval.xtokValue).type=typeValue_Class; } @@ -7703,7 +7709,7 @@ case 269: /* Line 1806 of yacc.c */ -#line 4571 "cimXmlOps.y" +#line 4572 "cimXmlOps.y" { (yyval.xtokValue).value=(yyvsp[(1) - (2)].xtokValue).value; (yyval.xtokValue).type=typeValue_charP; @@ -7713,7 +7719,7 @@ case 270: /* Line 1806 of yacc.c */ -#line 4579 "cimXmlOps.y" +#line 4580 "cimXmlOps.y" { (yyval.xtokValueArray).values=malloc(sizeof(XtokValue)); (yyval.xtokValueArray).next=0; @@ -7723,7 +7729,7 @@ case 271: /* Line 1806 of yacc.c */ -#line 4584 "cimXmlOps.y" +#line 4585 "cimXmlOps.y" { (yyval.xtokValueArray) = (yyvsp[(2) - (3)].xtokValueArray); (yyval.xtokValueArray).values[(yyval.xtokValueArray).next].value = NULL; @@ -7734,7 +7740,7 @@ case 272: /* Line 1806 of yacc.c */ -#line 4594 "cimXmlOps.y" +#line 4595 "cimXmlOps.y" { (yyval.xtokValueArray).next=1; (yyval.xtokValueArray).max=VALUEARRAY_MAX_START; @@ -7746,7 +7752,7 @@ case 273: /* Line 1806 of yacc.c */ -#line 4601 "cimXmlOps.y" +#line 4602 "cimXmlOps.y" { if ((yyval.xtokValueArray).next == (yyval.xtokValueArray).max) { /* max was hit; let's bump it up 50% */ (yyval.xtokValueArray).max = (int)((yyval.xtokValueArray).max * ((float)3)/2); @@ -7760,7 +7766,7 @@ case 274: /* Line 1806 of yacc.c */ -#line 4613 "cimXmlOps.y" +#line 4614 "cimXmlOps.y" { (yyval.xtokValueReference).instancePath=(yyvsp[(2) - (3)].xtokInstancePath); (yyval.xtokValueReference).type=typeValRef_InstancePath; @@ -7770,7 +7776,7 @@ case 275: /* Line 1806 of yacc.c */ -#line 4618 "cimXmlOps.y" +#line 4619 "cimXmlOps.y" { (yyval.xtokValueReference).localInstancePath=(yyvsp[(2) - (3)].xtokLocalInstancePath); (yyval.xtokValueReference).type=typeValRef_LocalInstancePath; @@ -7780,7 +7786,7 @@ case 276: /* Line 1806 of yacc.c */ -#line 4623 "cimXmlOps.y" +#line 4624 "cimXmlOps.y" { (yyval.xtokValueReference).instanceName=(yyvsp[(2) - (3)].xtokInstanceName); (yyval.xtokValueReference).type=typeValRef_InstanceName; @@ -7790,7 +7796,7 @@ case 277: /* Line 1806 of yacc.c */ -#line 4631 "cimXmlOps.y" +#line 4632 "cimXmlOps.y" { (yyval.xtokValueRefArray)=(yyvsp[(2) - (3)].xtokValueRefArray); } @@ -7799,7 +7805,7 @@ case 278: /* Line 1806 of yacc.c */ -#line 4638 "cimXmlOps.y" +#line 4639 "cimXmlOps.y" { (yyval.xtokValueRefArray).next=1; (yyval.xtokValueRefArray).max=VALUEREFARRAY_MAX_START; @@ -7811,7 +7817,7 @@ case 279: /* Line 1806 of yacc.c */ -#line 4645 "cimXmlOps.y" +#line 4646 "cimXmlOps.y" { if ((yyval.xtokValueRefArray).next == (yyval.xtokValueRefArray).max) { /* max was hit; let's bump it up 50% */ (yyval.xtokValueRefArray).max = (int)((yyval.xtokValueRefArray).max * ((float)3)/2); @@ -7825,7 +7831,7 @@ case 280: /* Line 1806 of yacc.c */ -#line 4657 "cimXmlOps.y" +#line 4658 "cimXmlOps.y" { if (strcasecmp((yyvsp[(1) - (2)].xtokValue).value,"true")==0) (yyval.boolValue)=1; if (strcasecmp((yyvsp[(1) - (2)].xtokValue).value,"false")==0) (yyval.boolValue)=0; @@ -7835,7 +7841,7 @@ case 281: /* Line 1806 of yacc.c */ -#line 4669 "cimXmlOps.y" +#line 4670 "cimXmlOps.y" { (yyval.xtokOpenEnumInstancePaths).op.count = EIN_REQ_REG_SEGMENTS; (yyval.xtokOpenEnumInstancePaths).op.type = OPS_OpenEnumerateInstancePaths; @@ -7851,7 +7857,7 @@ case 282: /* Line 1806 of yacc.c */ -#line 4680 "cimXmlOps.y" +#line 4681 "cimXmlOps.y" { (yyval.xtokOpenEnumInstancePaths).op.count = EIN_REQ_REG_SEGMENTS; (yyval.xtokOpenEnumInstancePaths).op.type = OPS_OpenEnumerateInstancePaths; @@ -7871,7 +7877,7 @@ case 283: /* Line 1806 of yacc.c */ -#line 4698 "cimXmlOps.y" +#line 4699 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokOpenEnumInstancePathsParms).className) (yyval.xtokOpenEnumInstancePathsParmsList).className=(yyvsp[(1) - (1)].xtokOpenEnumInstancePathsParms).className; (yyval.xtokOpenEnumInstancePathsParmsList).flags=(yyvsp[(1) - (1)].xtokOpenEnumInstancePathsParms).flags; @@ -7886,7 +7892,7 @@ case 284: /* Line 1806 of yacc.c */ -#line 4708 "cimXmlOps.y" +#line 4709 "cimXmlOps.y" { if ((yyvsp[(2) - (2)].xtokOpenEnumInstancePathsParms).className) (yyval.xtokOpenEnumInstancePathsParmsList).className=(yyvsp[(2) - (2)].xtokOpenEnumInstancePathsParms).className; (yyval.xtokOpenEnumInstancePathsParmsList).flags=(yyvsp[(1) - (2)].xtokOpenEnumInstancePathsParmsList).flags|(yyvsp[(2) - (2)].xtokOpenEnumInstancePathsParms).flags; @@ -7901,7 +7907,7 @@ case 285: /* Line 1806 of yacc.c */ -#line 4721 "cimXmlOps.y" +#line 4722 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); (yyval.xtokOpenEnumInstancePathsParms).className = (yyvsp[(2) - (3)].className); @@ -7911,7 +7917,7 @@ case 286: /* Line 1806 of yacc.c */ -#line 4726 "cimXmlOps.y" +#line 4727 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); (yyval.xtokOpenEnumInstancePathsParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_continueOnError : 0 ; @@ -7922,7 +7928,7 @@ case 287: /* Line 1806 of yacc.c */ -#line 4732 "cimXmlOps.y" +#line 4733 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); } @@ -7931,7 +7937,7 @@ case 288: /* Line 1806 of yacc.c */ -#line 4736 "cimXmlOps.y" +#line 4737 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); (yyval.xtokOpenEnumInstancePathsParms).operationTimeout=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -7941,7 +7947,7 @@ case 289: /* Line 1806 of yacc.c */ -#line 4741 "cimXmlOps.y" +#line 4742 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); } @@ -7950,7 +7956,7 @@ case 290: /* Line 1806 of yacc.c */ -#line 4745 "cimXmlOps.y" +#line 4746 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); (yyval.xtokOpenEnumInstancePathsParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -7960,7 +7966,7 @@ case 291: /* Line 1806 of yacc.c */ -#line 4750 "cimXmlOps.y" +#line 4751 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); } @@ -7969,7 +7975,7 @@ case 292: /* Line 1806 of yacc.c */ -#line 4754 "cimXmlOps.y" +#line 4755 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); (yyval.xtokOpenEnumInstancePathsParms).filterQuery=(yyvsp[(2) - (3)].xtokValue).value; @@ -7979,7 +7985,7 @@ case 293: /* Line 1806 of yacc.c */ -#line 4759 "cimXmlOps.y" +#line 4760 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); } @@ -7988,7 +7994,7 @@ case 294: /* Line 1806 of yacc.c */ -#line 4763 "cimXmlOps.y" +#line 4764 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); (yyval.xtokOpenEnumInstancePathsParms).filterQueryLang=(yyvsp[(2) - (3)].xtokValue).value; @@ -7998,7 +8004,7 @@ case 295: /* Line 1806 of yacc.c */ -#line 4768 "cimXmlOps.y" +#line 4769 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancePathsParms), 0, sizeof((yyval.xtokOpenEnumInstancePathsParms))); } @@ -8007,7 +8013,7 @@ case 296: /* Line 1806 of yacc.c */ -#line 4780 "cimXmlOps.y" +#line 4781 "cimXmlOps.y" { (yyval.xtokOpenEnumInstances).op.count = EI_REQ_REG_SEGMENTS; (yyval.xtokOpenEnumInstances).op.type = OPS_OpenEnumerateInstances; @@ -8025,7 +8031,7 @@ case 297: /* Line 1806 of yacc.c */ -#line 4793 "cimXmlOps.y" +#line 4794 "cimXmlOps.y" { (yyval.xtokOpenEnumInstances).op.count = EI_REQ_REG_SEGMENTS; (yyval.xtokOpenEnumInstances).op.type = OPS_OpenEnumerateInstances; @@ -8047,7 +8053,7 @@ case 298: /* Line 1806 of yacc.c */ -#line 4813 "cimXmlOps.y" +#line 4814 "cimXmlOps.y" { (yyval.xtokOpenEnumInstancesParmsList).flags=(yyvsp[(1) - (1)].xtokOpenEnumInstancesParms).flags; (yyval.xtokOpenEnumInstancesParmsList).flagsSet=(yyvsp[(1) - (1)].xtokOpenEnumInstancesParms).flagsSet; @@ -8066,7 +8072,7 @@ case 299: /* Line 1806 of yacc.c */ -#line 4827 "cimXmlOps.y" +#line 4828 "cimXmlOps.y" { (yyval.xtokOpenEnumInstancesParmsList).flags=(yyvsp[(1) - (2)].xtokOpenEnumInstancesParmsList).flags|(yyvsp[(2) - (2)].xtokOpenEnumInstancesParms).flags; (yyval.xtokOpenEnumInstancesParmsList).flagsSet=(yyvsp[(1) - (2)].xtokOpenEnumInstancesParmsList).flagsSet|(yyvsp[(2) - (2)].xtokOpenEnumInstancesParms).flagsSet; @@ -8085,7 +8091,7 @@ case 300: /* Line 1806 of yacc.c */ -#line 4844 "cimXmlOps.y" +#line 4845 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).className = (yyvsp[(2) - (3)].className); @@ -8095,7 +8101,7 @@ case 301: /* Line 1806 of yacc.c */ -#line 4849 "cimXmlOps.y" +#line 4850 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_localOnly : 0 ; @@ -8106,7 +8112,7 @@ case 302: /* Line 1806 of yacc.c */ -#line 4855 "cimXmlOps.y" +#line 4856 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8115,7 +8121,7 @@ case 303: /* Line 1806 of yacc.c */ -#line 4859 "cimXmlOps.y" +#line 4860 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; @@ -8126,7 +8132,7 @@ case 304: /* Line 1806 of yacc.c */ -#line 4865 "cimXmlOps.y" +#line 4866 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8135,7 +8141,7 @@ case 305: /* Line 1806 of yacc.c */ -#line 4869 "cimXmlOps.y" +#line 4870 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_deepInheritance : 0 ; @@ -8146,7 +8152,7 @@ case 306: /* Line 1806 of yacc.c */ -#line 4875 "cimXmlOps.y" +#line 4876 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8155,7 +8161,7 @@ case 307: /* Line 1806 of yacc.c */ -#line 4879 "cimXmlOps.y" +#line 4880 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; @@ -8166,7 +8172,7 @@ case 308: /* Line 1806 of yacc.c */ -#line 4885 "cimXmlOps.y" +#line 4886 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8175,7 +8181,7 @@ case 309: /* Line 1806 of yacc.c */ -#line 4889 "cimXmlOps.y" +#line 4890 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); @@ -8186,7 +8192,7 @@ case 310: /* Line 1806 of yacc.c */ -#line 4895 "cimXmlOps.y" +#line 4896 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8195,7 +8201,7 @@ case 311: /* Line 1806 of yacc.c */ -#line 4899 "cimXmlOps.y" +#line 4900 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_continueOnError : 0 ; @@ -8206,7 +8212,7 @@ case 312: /* Line 1806 of yacc.c */ -#line 4905 "cimXmlOps.y" +#line 4906 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8215,7 +8221,7 @@ case 313: /* Line 1806 of yacc.c */ -#line 4909 "cimXmlOps.y" +#line 4910 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).operationTimeout=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -8225,7 +8231,7 @@ case 314: /* Line 1806 of yacc.c */ -#line 4914 "cimXmlOps.y" +#line 4915 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8234,7 +8240,7 @@ case 315: /* Line 1806 of yacc.c */ -#line 4918 "cimXmlOps.y" +#line 4919 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -8244,7 +8250,7 @@ case 316: /* Line 1806 of yacc.c */ -#line 4923 "cimXmlOps.y" +#line 4924 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8253,7 +8259,7 @@ case 317: /* Line 1806 of yacc.c */ -#line 4927 "cimXmlOps.y" +#line 4928 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).filterQuery=(yyvsp[(2) - (3)].xtokValue).value; @@ -8263,7 +8269,7 @@ case 318: /* Line 1806 of yacc.c */ -#line 4932 "cimXmlOps.y" +#line 4933 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8272,7 +8278,7 @@ case 319: /* Line 1806 of yacc.c */ -#line 4936 "cimXmlOps.y" +#line 4937 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); (yyval.xtokOpenEnumInstancesParms).filterQueryLang=(yyvsp[(2) - (3)].xtokValue).value; @@ -8282,7 +8288,7 @@ case 320: /* Line 1806 of yacc.c */ -#line 4941 "cimXmlOps.y" +#line 4942 "cimXmlOps.y" { memset(&(yyval.xtokOpenEnumInstancesParms), 0, sizeof((yyval.xtokOpenEnumInstancesParms))); } @@ -8291,7 +8297,7 @@ case 321: /* Line 1806 of yacc.c */ -#line 4953 "cimXmlOps.y" +#line 4954 "cimXmlOps.y" { (yyval.xtokOpenAssociatorInstancePaths).op.count = AIN_REQ_REG_SEGMENTS; (yyval.xtokOpenAssociatorInstancePaths).op.type = OPS_OpenAssociatorInstancePaths; @@ -8313,7 +8319,7 @@ case 322: /* Line 1806 of yacc.c */ -#line 4970 "cimXmlOps.y" +#line 4971 "cimXmlOps.y" { (yyval.xtokOpenAssociatorInstancePaths).op.count = AIN_REQ_REG_SEGMENTS; (yyval.xtokOpenAssociatorInstancePaths).op.type = OPS_OpenAssociatorInstancePaths; @@ -8339,7 +8345,7 @@ case 323: /* Line 1806 of yacc.c */ -#line 4994 "cimXmlOps.y" +#line 4995 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokOpenAssociatorInstancePathsParms).objNameSet) { (yyval.xtokOpenAssociatorInstancePathsParmsList).objectName=(yyvsp[(1) - (1)].xtokOpenAssociatorInstancePathsParms).objectName; @@ -8361,7 +8367,7 @@ case 324: /* Line 1806 of yacc.c */ -#line 5011 "cimXmlOps.y" +#line 5012 "cimXmlOps.y" { if ((yyvsp[(2) - (2)].xtokOpenAssociatorInstancePathsParms).assocClass) (yyval.xtokOpenAssociatorInstancePathsParmsList).assocClass=(yyvsp[(2) - (2)].xtokOpenAssociatorInstancePathsParms).assocClass; else if ((yyvsp[(2) - (2)].xtokOpenAssociatorInstancePathsParms).resultClass) (yyval.xtokOpenAssociatorInstancePathsParmsList).resultClass=(yyvsp[(2) - (2)].xtokOpenAssociatorInstancePathsParms).resultClass; @@ -8383,7 +8389,7 @@ case 325: /* Line 1806 of yacc.c */ -#line 5031 "cimXmlOps.y" +#line 5032 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).objectName = (yyvsp[(2) - (3)].xtokInstanceName); @@ -8394,7 +8400,7 @@ case 326: /* Line 1806 of yacc.c */ -#line 5037 "cimXmlOps.y" +#line 5038 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).assocClass = (yyvsp[(2) - (3)].className); @@ -8404,7 +8410,7 @@ case 327: /* Line 1806 of yacc.c */ -#line 5042 "cimXmlOps.y" +#line 5043 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8413,7 +8419,7 @@ case 328: /* Line 1806 of yacc.c */ -#line 5046 "cimXmlOps.y" +#line 5047 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).resultClass = (yyvsp[(2) - (3)].className); @@ -8423,7 +8429,7 @@ case 329: /* Line 1806 of yacc.c */ -#line 5051 "cimXmlOps.y" +#line 5052 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8432,7 +8438,7 @@ case 330: /* Line 1806 of yacc.c */ -#line 5055 "cimXmlOps.y" +#line 5056 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).role = (yyvsp[(2) - (3)].xtokValue).value; @@ -8442,7 +8448,7 @@ case 331: /* Line 1806 of yacc.c */ -#line 5060 "cimXmlOps.y" +#line 5061 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8451,7 +8457,7 @@ case 332: /* Line 1806 of yacc.c */ -#line 5064 "cimXmlOps.y" +#line 5065 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).resultRole = (yyvsp[(2) - (3)].xtokValue).value; @@ -8461,7 +8467,7 @@ case 333: /* Line 1806 of yacc.c */ -#line 5069 "cimXmlOps.y" +#line 5070 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8470,7 +8476,7 @@ case 334: /* Line 1806 of yacc.c */ -#line 5073 "cimXmlOps.y" +#line 5074 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_continueOnError : 0 ; @@ -8481,7 +8487,7 @@ case 335: /* Line 1806 of yacc.c */ -#line 5079 "cimXmlOps.y" +#line 5080 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8490,7 +8496,7 @@ case 336: /* Line 1806 of yacc.c */ -#line 5083 "cimXmlOps.y" +#line 5084 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).operationTimeout=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -8500,7 +8506,7 @@ case 337: /* Line 1806 of yacc.c */ -#line 5088 "cimXmlOps.y" +#line 5089 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8509,7 +8515,7 @@ case 338: /* Line 1806 of yacc.c */ -#line 5092 "cimXmlOps.y" +#line 5093 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -8519,7 +8525,7 @@ case 339: /* Line 1806 of yacc.c */ -#line 5097 "cimXmlOps.y" +#line 5098 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8528,7 +8534,7 @@ case 340: /* Line 1806 of yacc.c */ -#line 5101 "cimXmlOps.y" +#line 5102 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).filterQuery=(yyvsp[(2) - (3)].xtokValue).value; @@ -8538,7 +8544,7 @@ case 341: /* Line 1806 of yacc.c */ -#line 5106 "cimXmlOps.y" +#line 5107 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8547,7 +8553,7 @@ case 342: /* Line 1806 of yacc.c */ -#line 5110 "cimXmlOps.y" +#line 5111 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); (yyval.xtokOpenAssociatorInstancePathsParms).filterQueryLang=(yyvsp[(2) - (3)].xtokValue).value; @@ -8557,7 +8563,7 @@ case 343: /* Line 1806 of yacc.c */ -#line 5115 "cimXmlOps.y" +#line 5116 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancePathsParms), 0, sizeof((yyval.xtokOpenAssociatorInstancePathsParms))); } @@ -8566,7 +8572,7 @@ case 344: /* Line 1806 of yacc.c */ -#line 5127 "cimXmlOps.y" +#line 5128 "cimXmlOps.y" { (yyval.xtokOpenAssociatorInstances).op.count = AI_REQ_REG_SEGMENTS; (yyval.xtokOpenAssociatorInstances).op.type = OPS_OpenAssociatorInstances; @@ -8589,7 +8595,7 @@ case 345: /* Line 1806 of yacc.c */ -#line 5145 "cimXmlOps.y" +#line 5146 "cimXmlOps.y" { (yyval.xtokOpenAssociatorInstances).op.count = AI_REQ_REG_SEGMENTS; (yyval.xtokOpenAssociatorInstances).op.type = OPS_OpenAssociatorInstances; @@ -8617,7 +8623,7 @@ case 346: /* Line 1806 of yacc.c */ -#line 5171 "cimXmlOps.y" +#line 5172 "cimXmlOps.y" { (yyval.xtokOpenAssociatorInstancesParmsList).flags=(yyvsp[(1) - (1)].xtokOpenAssociatorInstancesParms).flags; (yyval.xtokOpenAssociatorInstancesParmsList).flagsSet=(yyvsp[(1) - (1)].xtokOpenAssociatorInstancesParms).flagsSet; @@ -8643,7 +8649,7 @@ case 347: /* Line 1806 of yacc.c */ -#line 5192 "cimXmlOps.y" +#line 5193 "cimXmlOps.y" { (yyval.xtokOpenAssociatorInstancesParmsList).flags=(yyvsp[(1) - (2)].xtokOpenAssociatorInstancesParmsList).flags|(yyvsp[(2) - (2)].xtokOpenAssociatorInstancesParms).flags; (yyval.xtokOpenAssociatorInstancesParmsList).flagsSet=(yyvsp[(1) - (2)].xtokOpenAssociatorInstancesParmsList).flagsSet|(yyvsp[(2) - (2)].xtokOpenAssociatorInstancesParms).flagsSet; @@ -8669,7 +8675,7 @@ case 348: /* Line 1806 of yacc.c */ -#line 5216 "cimXmlOps.y" +#line 5217 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).objectName = (yyvsp[(2) - (3)].xtokInstanceName); @@ -8680,7 +8686,7 @@ case 349: /* Line 1806 of yacc.c */ -#line 5222 "cimXmlOps.y" +#line 5223 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).assocClass = (yyvsp[(2) - (3)].className); @@ -8690,7 +8696,7 @@ case 350: /* Line 1806 of yacc.c */ -#line 5227 "cimXmlOps.y" +#line 5228 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8699,7 +8705,7 @@ case 351: /* Line 1806 of yacc.c */ -#line 5231 "cimXmlOps.y" +#line 5232 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).resultClass = (yyvsp[(2) - (3)].className); @@ -8709,7 +8715,7 @@ case 352: /* Line 1806 of yacc.c */ -#line 5236 "cimXmlOps.y" +#line 5237 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8718,7 +8724,7 @@ case 353: /* Line 1806 of yacc.c */ -#line 5240 "cimXmlOps.y" +#line 5241 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).role = (yyvsp[(2) - (3)].xtokValue).value; @@ -8728,7 +8734,7 @@ case 354: /* Line 1806 of yacc.c */ -#line 5245 "cimXmlOps.y" +#line 5246 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8737,7 +8743,7 @@ case 355: /* Line 1806 of yacc.c */ -#line 5249 "cimXmlOps.y" +#line 5250 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).resultRole = (yyvsp[(2) - (3)].xtokValue).value; @@ -8747,7 +8753,7 @@ case 356: /* Line 1806 of yacc.c */ -#line 5254 "cimXmlOps.y" +#line 5255 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8756,7 +8762,7 @@ case 357: /* Line 1806 of yacc.c */ -#line 5258 "cimXmlOps.y" +#line 5259 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; @@ -8767,7 +8773,7 @@ case 358: /* Line 1806 of yacc.c */ -#line 5264 "cimXmlOps.y" +#line 5265 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8776,7 +8782,7 @@ case 359: /* Line 1806 of yacc.c */ -#line 5268 "cimXmlOps.y" +#line 5269 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; @@ -8787,7 +8793,7 @@ case 360: /* Line 1806 of yacc.c */ -#line 5274 "cimXmlOps.y" +#line 5275 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8796,7 +8802,7 @@ case 361: /* Line 1806 of yacc.c */ -#line 5278 "cimXmlOps.y" +#line 5279 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); @@ -8807,7 +8813,7 @@ case 362: /* Line 1806 of yacc.c */ -#line 5284 "cimXmlOps.y" +#line 5285 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8816,7 +8822,7 @@ case 363: /* Line 1806 of yacc.c */ -#line 5288 "cimXmlOps.y" +#line 5289 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_continueOnError : 0 ; @@ -8827,7 +8833,7 @@ case 364: /* Line 1806 of yacc.c */ -#line 5294 "cimXmlOps.y" +#line 5295 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8836,7 +8842,7 @@ case 365: /* Line 1806 of yacc.c */ -#line 5298 "cimXmlOps.y" +#line 5299 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).operationTimeout=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -8846,7 +8852,7 @@ case 366: /* Line 1806 of yacc.c */ -#line 5303 "cimXmlOps.y" +#line 5304 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8855,7 +8861,7 @@ case 367: /* Line 1806 of yacc.c */ -#line 5307 "cimXmlOps.y" +#line 5308 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -8865,7 +8871,7 @@ case 368: /* Line 1806 of yacc.c */ -#line 5312 "cimXmlOps.y" +#line 5313 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8874,7 +8880,7 @@ case 369: /* Line 1806 of yacc.c */ -#line 5316 "cimXmlOps.y" +#line 5317 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).filterQuery=(yyvsp[(2) - (3)].xtokValue).value; @@ -8884,7 +8890,7 @@ case 370: /* Line 1806 of yacc.c */ -#line 5321 "cimXmlOps.y" +#line 5322 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8893,7 +8899,7 @@ case 371: /* Line 1806 of yacc.c */ -#line 5325 "cimXmlOps.y" +#line 5326 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); (yyval.xtokOpenAssociatorInstancesParms).filterQueryLang=(yyvsp[(2) - (3)].xtokValue).value; @@ -8903,7 +8909,7 @@ case 372: /* Line 1806 of yacc.c */ -#line 5330 "cimXmlOps.y" +#line 5331 "cimXmlOps.y" { memset(&(yyval.xtokOpenAssociatorInstancesParms), 0, sizeof((yyval.xtokOpenAssociatorInstancesParms))); } @@ -8912,7 +8918,7 @@ case 373: /* Line 1806 of yacc.c */ -#line 5342 "cimXmlOps.y" +#line 5343 "cimXmlOps.y" { (yyval.xtokOpenReferenceInstancePaths).op.count = RIN_REQ_REG_SEGMENTS; (yyval.xtokOpenReferenceInstancePaths).op.type = OPS_OpenReferenceInstancePaths; @@ -8932,7 +8938,7 @@ case 374: /* Line 1806 of yacc.c */ -#line 5357 "cimXmlOps.y" +#line 5358 "cimXmlOps.y" { (yyval.xtokOpenReferenceInstancePaths).op.count = RIN_REQ_REG_SEGMENTS; (yyval.xtokOpenReferenceInstancePaths).op.type = OPS_OpenReferenceInstancePaths; @@ -8956,7 +8962,7 @@ case 375: /* Line 1806 of yacc.c */ -#line 5379 "cimXmlOps.y" +#line 5380 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokOpenReferenceInstancePathsParms).objNameSet) { (yyval.xtokOpenReferenceInstancePathsParmsList).objectName=(yyvsp[(1) - (1)].xtokOpenReferenceInstancePathsParms).objectName; @@ -8976,7 +8982,7 @@ case 376: /* Line 1806 of yacc.c */ -#line 5394 "cimXmlOps.y" +#line 5395 "cimXmlOps.y" { if((yyvsp[(2) - (2)].xtokOpenReferenceInstancePathsParms).objNameSet) { (yyval.xtokOpenReferenceInstancePathsParmsList).objectName=(yyvsp[(2) - (2)].xtokOpenReferenceInstancePathsParms).objectName; @@ -8996,7 +9002,7 @@ case 377: /* Line 1806 of yacc.c */ -#line 5412 "cimXmlOps.y" +#line 5413 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); (yyval.xtokOpenReferenceInstancePathsParms).objectName = (yyvsp[(2) - (3)].xtokInstanceName); @@ -9007,7 +9013,7 @@ case 378: /* Line 1806 of yacc.c */ -#line 5418 "cimXmlOps.y" +#line 5419 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); (yyval.xtokOpenReferenceInstancePathsParms).resultClass = (yyvsp[(2) - (3)].className); @@ -9017,7 +9023,7 @@ case 379: /* Line 1806 of yacc.c */ -#line 5423 "cimXmlOps.y" +#line 5424 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); } @@ -9026,7 +9032,7 @@ case 380: /* Line 1806 of yacc.c */ -#line 5427 "cimXmlOps.y" +#line 5428 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); (yyval.xtokOpenReferenceInstancePathsParms).role = (yyvsp[(2) - (3)].xtokValue).value; @@ -9036,7 +9042,7 @@ case 381: /* Line 1806 of yacc.c */ -#line 5432 "cimXmlOps.y" +#line 5433 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); } @@ -9045,7 +9051,7 @@ case 382: /* Line 1806 of yacc.c */ -#line 5436 "cimXmlOps.y" +#line 5437 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); (yyval.xtokOpenReferenceInstancePathsParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_continueOnError : 0 ; @@ -9056,7 +9062,7 @@ case 383: /* Line 1806 of yacc.c */ -#line 5442 "cimXmlOps.y" +#line 5443 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); } @@ -9065,7 +9071,7 @@ case 384: /* Line 1806 of yacc.c */ -#line 5446 "cimXmlOps.y" +#line 5447 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); (yyval.xtokOpenReferenceInstancePathsParms).operationTimeout=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9075,7 +9081,7 @@ case 385: /* Line 1806 of yacc.c */ -#line 5451 "cimXmlOps.y" +#line 5452 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); } @@ -9084,7 +9090,7 @@ case 386: /* Line 1806 of yacc.c */ -#line 5455 "cimXmlOps.y" +#line 5456 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); (yyval.xtokOpenReferenceInstancePathsParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9094,7 +9100,7 @@ case 387: /* Line 1806 of yacc.c */ -#line 5460 "cimXmlOps.y" +#line 5461 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); } @@ -9103,7 +9109,7 @@ case 388: /* Line 1806 of yacc.c */ -#line 5464 "cimXmlOps.y" +#line 5465 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); (yyval.xtokOpenReferenceInstancePathsParms).filterQuery=(yyvsp[(2) - (3)].xtokValue).value; @@ -9113,7 +9119,7 @@ case 389: /* Line 1806 of yacc.c */ -#line 5469 "cimXmlOps.y" +#line 5470 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); } @@ -9122,7 +9128,7 @@ case 390: /* Line 1806 of yacc.c */ -#line 5473 "cimXmlOps.y" +#line 5474 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); (yyval.xtokOpenReferenceInstancePathsParms).filterQueryLang=(yyvsp[(2) - (3)].xtokValue).value; @@ -9132,7 +9138,7 @@ case 391: /* Line 1806 of yacc.c */ -#line 5478 "cimXmlOps.y" +#line 5479 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancePathsParms), 0, sizeof((yyval.xtokOpenReferenceInstancePathsParms))); } @@ -9141,7 +9147,7 @@ case 392: /* Line 1806 of yacc.c */ -#line 5490 "cimXmlOps.y" +#line 5491 "cimXmlOps.y" { (yyval.xtokOpenReferenceInstances).op.count = RI_REQ_REG_SEGMENTS; (yyval.xtokOpenReferenceInstances).op.type = OPS_OpenReferenceInstances; @@ -9162,7 +9168,7 @@ case 393: /* Line 1806 of yacc.c */ -#line 5506 "cimXmlOps.y" +#line 5507 "cimXmlOps.y" { (yyval.xtokOpenReferenceInstances).op.count = RI_REQ_REG_SEGMENTS; (yyval.xtokOpenReferenceInstances).op.type = OPS_OpenReferenceInstances; @@ -9188,7 +9194,7 @@ case 394: /* Line 1806 of yacc.c */ -#line 5530 "cimXmlOps.y" +#line 5531 "cimXmlOps.y" { (yyval.xtokOpenReferenceInstancesParmsList).flags=(yyvsp[(1) - (1)].xtokOpenReferenceInstancesParms).flags; (yyval.xtokOpenReferenceInstancesParmsList).flagsSet=(yyvsp[(1) - (1)].xtokOpenReferenceInstancesParms).flagsSet; @@ -9212,7 +9218,7 @@ case 395: /* Line 1806 of yacc.c */ -#line 5549 "cimXmlOps.y" +#line 5550 "cimXmlOps.y" { (yyval.xtokOpenReferenceInstancesParmsList).flags=(yyvsp[(1) - (2)].xtokOpenReferenceInstancesParmsList).flags|(yyvsp[(2) - (2)].xtokOpenReferenceInstancesParms).flags; (yyval.xtokOpenReferenceInstancesParmsList).flagsSet=(yyvsp[(1) - (2)].xtokOpenReferenceInstancesParmsList).flagsSet|(yyvsp[(2) - (2)].xtokOpenReferenceInstancesParms).flagsSet; @@ -9236,7 +9242,7 @@ case 396: /* Line 1806 of yacc.c */ -#line 5571 "cimXmlOps.y" +#line 5572 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).objectName = (yyvsp[(2) - (3)].xtokInstanceName); @@ -9247,7 +9253,7 @@ case 397: /* Line 1806 of yacc.c */ -#line 5577 "cimXmlOps.y" +#line 5578 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).resultClass = (yyvsp[(2) - (3)].className); @@ -9257,7 +9263,7 @@ case 398: /* Line 1806 of yacc.c */ -#line 5582 "cimXmlOps.y" +#line 5583 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9266,7 +9272,7 @@ case 399: /* Line 1806 of yacc.c */ -#line 5586 "cimXmlOps.y" +#line 5587 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).role = (yyvsp[(2) - (3)].xtokValue).value; @@ -9276,7 +9282,7 @@ case 400: /* Line 1806 of yacc.c */ -#line 5591 "cimXmlOps.y" +#line 5592 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9285,7 +9291,7 @@ case 401: /* Line 1806 of yacc.c */ -#line 5595 "cimXmlOps.y" +#line 5596 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeQualifiers : 0 ; @@ -9296,7 +9302,7 @@ case 402: /* Line 1806 of yacc.c */ -#line 5601 "cimXmlOps.y" +#line 5602 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9305,7 +9311,7 @@ case 403: /* Line 1806 of yacc.c */ -#line 5605 "cimXmlOps.y" +#line 5606 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_includeClassOrigin : 0 ; @@ -9316,7 +9322,7 @@ case 404: /* Line 1806 of yacc.c */ -#line 5611 "cimXmlOps.y" +#line 5612 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9325,7 +9331,7 @@ case 405: /* Line 1806 of yacc.c */ -#line 5615 "cimXmlOps.y" +#line 5616 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).propertyList=(yyvsp[(2) - (3)].xtokValueArray); @@ -9336,7 +9342,7 @@ case 406: /* Line 1806 of yacc.c */ -#line 5621 "cimXmlOps.y" +#line 5622 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9345,7 +9351,7 @@ case 407: /* Line 1806 of yacc.c */ -#line 5625 "cimXmlOps.y" +#line 5626 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_continueOnError : 0 ; @@ -9356,7 +9362,7 @@ case 408: /* Line 1806 of yacc.c */ -#line 5631 "cimXmlOps.y" +#line 5632 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9365,7 +9371,7 @@ case 409: /* Line 1806 of yacc.c */ -#line 5635 "cimXmlOps.y" +#line 5636 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).operationTimeout=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9375,7 +9381,7 @@ case 410: /* Line 1806 of yacc.c */ -#line 5640 "cimXmlOps.y" +#line 5641 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9384,7 +9390,7 @@ case 411: /* Line 1806 of yacc.c */ -#line 5644 "cimXmlOps.y" +#line 5645 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9394,7 +9400,7 @@ case 412: /* Line 1806 of yacc.c */ -#line 5649 "cimXmlOps.y" +#line 5650 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9403,7 +9409,7 @@ case 413: /* Line 1806 of yacc.c */ -#line 5653 "cimXmlOps.y" +#line 5654 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).filterQuery=(yyvsp[(2) - (3)].xtokValue).value; @@ -9413,7 +9419,7 @@ case 414: /* Line 1806 of yacc.c */ -#line 5658 "cimXmlOps.y" +#line 5659 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9422,7 +9428,7 @@ case 415: /* Line 1806 of yacc.c */ -#line 5662 "cimXmlOps.y" +#line 5663 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); (yyval.xtokOpenReferenceInstancesParms).filterQueryLang=(yyvsp[(2) - (3)].xtokValue).value; @@ -9432,7 +9438,7 @@ case 416: /* Line 1806 of yacc.c */ -#line 5667 "cimXmlOps.y" +#line 5668 "cimXmlOps.y" { memset(&(yyval.xtokOpenReferenceInstancesParms), 0, sizeof((yyval.xtokOpenReferenceInstancesParms))); } @@ -9441,7 +9447,7 @@ case 417: /* Line 1806 of yacc.c */ -#line 5679 "cimXmlOps.y" +#line 5680 "cimXmlOps.y" { (yyval.xtokOpenQueryInstances).op.count = EQ_REQ_REG_SEGMENTS; (yyval.xtokOpenQueryInstances).op.type = OPS_OpenQueryInstances; @@ -9456,7 +9462,7 @@ case 418: /* Line 1806 of yacc.c */ -#line 5689 "cimXmlOps.y" +#line 5690 "cimXmlOps.y" { (yyval.xtokOpenQueryInstances).op.count = EQ_REQ_REG_SEGMENTS; (yyval.xtokOpenQueryInstances).op.type = OPS_OpenQueryInstances; @@ -9478,7 +9484,7 @@ case 419: /* Line 1806 of yacc.c */ -#line 5709 "cimXmlOps.y" +#line 5710 "cimXmlOps.y" { (yyval.xtokOpenQueryInstancesParmsList).flags=(yyvsp[(1) - (1)].xtokOpenQueryInstancesParms).flags; (yyval.xtokOpenQueryInstancesParmsList).flagsSet=(yyvsp[(1) - (1)].xtokOpenQueryInstancesParms).flagsSet; @@ -9492,7 +9498,7 @@ case 420: /* Line 1806 of yacc.c */ -#line 5718 "cimXmlOps.y" +#line 5719 "cimXmlOps.y" { (yyval.xtokOpenQueryInstancesParmsList).flags=(yyvsp[(1) - (2)].xtokOpenQueryInstancesParmsList).flags|(yyvsp[(2) - (2)].xtokOpenQueryInstancesParms).flags; (yyval.xtokOpenQueryInstancesParmsList).flagsSet=(yyvsp[(1) - (2)].xtokOpenQueryInstancesParmsList).flagsSet|(yyvsp[(2) - (2)].xtokOpenQueryInstancesParms).flagsSet; @@ -9506,7 +9512,7 @@ case 421: /* Line 1806 of yacc.c */ -#line 5730 "cimXmlOps.y" +#line 5731 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); (yyval.xtokOpenQueryInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_returnQueryResultClass : 0 ; @@ -9517,7 +9523,7 @@ case 422: /* Line 1806 of yacc.c */ -#line 5736 "cimXmlOps.y" +#line 5737 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); } @@ -9526,7 +9532,7 @@ case 423: /* Line 1806 of yacc.c */ -#line 5740 "cimXmlOps.y" +#line 5741 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); (yyval.xtokOpenQueryInstancesParms).flags = (yyvsp[(2) - (3)].boolValue) ? FL_continueOnError : 0 ; @@ -9537,7 +9543,7 @@ case 424: /* Line 1806 of yacc.c */ -#line 5746 "cimXmlOps.y" +#line 5747 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); } @@ -9546,7 +9552,7 @@ case 425: /* Line 1806 of yacc.c */ -#line 5750 "cimXmlOps.y" +#line 5751 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); (yyval.xtokOpenQueryInstancesParms).operationTimeout=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9556,7 +9562,7 @@ case 426: /* Line 1806 of yacc.c */ -#line 5755 "cimXmlOps.y" +#line 5756 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); } @@ -9565,7 +9571,7 @@ case 427: /* Line 1806 of yacc.c */ -#line 5759 "cimXmlOps.y" +#line 5760 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); (yyval.xtokOpenQueryInstancesParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9575,7 +9581,7 @@ case 428: /* Line 1806 of yacc.c */ -#line 5764 "cimXmlOps.y" +#line 5765 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); } @@ -9584,7 +9590,7 @@ case 429: /* Line 1806 of yacc.c */ -#line 5768 "cimXmlOps.y" +#line 5769 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); (yyval.xtokOpenQueryInstancesParms).filterQuery=(yyvsp[(2) - (3)].xtokValue).value; @@ -9594,7 +9600,7 @@ case 430: /* Line 1806 of yacc.c */ -#line 5773 "cimXmlOps.y" +#line 5774 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); } @@ -9603,7 +9609,7 @@ case 431: /* Line 1806 of yacc.c */ -#line 5777 "cimXmlOps.y" +#line 5778 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); (yyval.xtokOpenQueryInstancesParms).filterQueryLang=(yyvsp[(2) - (3)].xtokValue).value; @@ -9613,7 +9619,7 @@ case 432: /* Line 1806 of yacc.c */ -#line 5782 "cimXmlOps.y" +#line 5783 "cimXmlOps.y" { memset(&(yyval.xtokOpenQueryInstancesParms), 0, sizeof((yyval.xtokOpenQueryInstancesParms))); } @@ -9622,7 +9628,7 @@ case 433: /* Line 1806 of yacc.c */ -#line 5793 "cimXmlOps.y" +#line 5794 "cimXmlOps.y" { (yyval.xtokPullInstances).op.count = EI_REQ_REG_SEGMENTS; // TODO (yyval.xtokPullInstances).op.type = OPS_PullInstances; @@ -9637,7 +9643,7 @@ case 434: /* Line 1806 of yacc.c */ -#line 5803 "cimXmlOps.y" +#line 5804 "cimXmlOps.y" { (yyval.xtokPullInstances).op.count = EI_REQ_REG_SEGMENTS; (yyval.xtokPullInstances).op.type = OPS_PullInstances; @@ -9654,7 +9660,7 @@ case 435: /* Line 1806 of yacc.c */ -#line 5818 "cimXmlOps.y" +#line 5819 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokPullInstancesParms).maxObjectCount) (yyval.xtokPullInstancesParmsList).maxObjectCount=(yyvsp[(1) - (1)].xtokPullInstancesParms).maxObjectCount; if ((yyvsp[(1) - (1)].xtokPullInstancesParms).enumerationContext) (yyval.xtokPullInstancesParmsList).enumerationContext=(yyvsp[(1) - (1)].xtokPullInstancesParms).enumerationContext; @@ -9664,7 +9670,7 @@ case 436: /* Line 1806 of yacc.c */ -#line 5823 "cimXmlOps.y" +#line 5824 "cimXmlOps.y" { if ((yyvsp[(2) - (2)].xtokPullInstancesParms).maxObjectCount) (yyval.xtokPullInstancesParmsList).maxObjectCount=(yyvsp[(2) - (2)].xtokPullInstancesParms).maxObjectCount; if ((yyvsp[(2) - (2)].xtokPullInstancesParms).enumerationContext) (yyval.xtokPullInstancesParmsList).enumerationContext=(yyvsp[(2) - (2)].xtokPullInstancesParms).enumerationContext; @@ -9674,7 +9680,7 @@ case 437: /* Line 1806 of yacc.c */ -#line 5831 "cimXmlOps.y" +#line 5832 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancesParms), 0, sizeof((yyval.xtokPullInstancesParms))); (yyval.xtokPullInstancesParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9684,7 +9690,7 @@ case 438: /* Line 1806 of yacc.c */ -#line 5836 "cimXmlOps.y" +#line 5837 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancesParms), 0, sizeof((yyval.xtokPullInstancesParms))); } @@ -9693,7 +9699,7 @@ case 439: /* Line 1806 of yacc.c */ -#line 5840 "cimXmlOps.y" +#line 5841 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancesParms), 0, sizeof((yyval.xtokPullInstancesParms))); (yyval.xtokPullInstancesParms).enumerationContext=(yyvsp[(2) - (3)].enumerationContext); @@ -9703,7 +9709,7 @@ case 440: /* Line 1806 of yacc.c */ -#line 5845 "cimXmlOps.y" +#line 5846 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancesParms), 0, sizeof((yyval.xtokPullInstancesParms))); } @@ -9712,7 +9718,7 @@ case 441: /* Line 1806 of yacc.c */ -#line 5857 "cimXmlOps.y" +#line 5858 "cimXmlOps.y" { (yyval.xtokPullInstancesWithPath).op.count = EI_REQ_REG_SEGMENTS; // TODO (yyval.xtokPullInstancesWithPath).op.type = OPS_PullInstancesWithPath; @@ -9728,7 +9734,7 @@ case 442: /* Line 1806 of yacc.c */ -#line 5868 "cimXmlOps.y" +#line 5869 "cimXmlOps.y" { (yyval.xtokPullInstancesWithPath).op.count = EI_REQ_REG_SEGMENTS; (yyval.xtokPullInstancesWithPath).op.type = OPS_PullInstancesWithPath; @@ -9746,7 +9752,7 @@ case 443: /* Line 1806 of yacc.c */ -#line 5884 "cimXmlOps.y" +#line 5885 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokPullInstancesWithPathParms).maxObjectCount) (yyval.xtokPullInstancesWithPathParmsList).maxObjectCount=(yyvsp[(1) - (1)].xtokPullInstancesWithPathParms).maxObjectCount; if ((yyvsp[(1) - (1)].xtokPullInstancesWithPathParms).enumerationContext) (yyval.xtokPullInstancesWithPathParmsList).enumerationContext=(yyvsp[(1) - (1)].xtokPullInstancesWithPathParms).enumerationContext; @@ -9756,7 +9762,7 @@ case 444: /* Line 1806 of yacc.c */ -#line 5889 "cimXmlOps.y" +#line 5890 "cimXmlOps.y" { if ((yyvsp[(2) - (2)].xtokPullInstancesWithPathParms).maxObjectCount) (yyval.xtokPullInstancesWithPathParmsList).maxObjectCount=(yyvsp[(2) - (2)].xtokPullInstancesWithPathParms).maxObjectCount; if ((yyvsp[(2) - (2)].xtokPullInstancesWithPathParms).enumerationContext) (yyval.xtokPullInstancesWithPathParmsList).enumerationContext=(yyvsp[(2) - (2)].xtokPullInstancesWithPathParms).enumerationContext; @@ -9766,7 +9772,7 @@ case 445: /* Line 1806 of yacc.c */ -#line 5897 "cimXmlOps.y" +#line 5898 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancesWithPathParms), 0, sizeof((yyval.xtokPullInstancesWithPathParms))); (yyval.xtokPullInstancesWithPathParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9776,7 +9782,7 @@ case 446: /* Line 1806 of yacc.c */ -#line 5902 "cimXmlOps.y" +#line 5903 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancesWithPathParms), 0, sizeof((yyval.xtokPullInstancesWithPathParms))); } @@ -9785,7 +9791,7 @@ case 447: /* Line 1806 of yacc.c */ -#line 5906 "cimXmlOps.y" +#line 5907 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancesWithPathParms), 0, sizeof((yyval.xtokPullInstancesWithPathParms))); (yyval.xtokPullInstancesWithPathParms).enumerationContext=(yyvsp[(2) - (3)].enumerationContext); @@ -9795,7 +9801,7 @@ case 448: /* Line 1806 of yacc.c */ -#line 5911 "cimXmlOps.y" +#line 5912 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancesWithPathParms), 0, sizeof((yyval.xtokPullInstancesWithPathParms))); } @@ -9804,7 +9810,7 @@ case 449: /* Line 1806 of yacc.c */ -#line 5923 "cimXmlOps.y" +#line 5924 "cimXmlOps.y" { (yyval.xtokPullInstancePaths).op.count = EI_REQ_REG_SEGMENTS; // TODO (yyval.xtokPullInstancePaths).op.type = OPS_PullInstances; @@ -9820,7 +9826,7 @@ case 450: /* Line 1806 of yacc.c */ -#line 5934 "cimXmlOps.y" +#line 5935 "cimXmlOps.y" { (yyval.xtokPullInstancePaths).op.count = EI_REQ_REG_SEGMENTS; (yyval.xtokPullInstancePaths).op.type = OPS_PullInstances; @@ -9838,7 +9844,7 @@ case 451: /* Line 1806 of yacc.c */ -#line 5950 "cimXmlOps.y" +#line 5951 "cimXmlOps.y" { if ((yyvsp[(1) - (1)].xtokPullInstancePathsParms).maxObjectCount) (yyval.xtokPullInstancePathsParmsList).maxObjectCount=(yyvsp[(1) - (1)].xtokPullInstancePathsParms).maxObjectCount; if ((yyvsp[(1) - (1)].xtokPullInstancePathsParms).enumerationContext) (yyval.xtokPullInstancePathsParmsList).enumerationContext=(yyvsp[(1) - (1)].xtokPullInstancePathsParms).enumerationContext; @@ -9848,7 +9854,7 @@ case 452: /* Line 1806 of yacc.c */ -#line 5955 "cimXmlOps.y" +#line 5956 "cimXmlOps.y" { if ((yyvsp[(2) - (2)].xtokPullInstancePathsParms).maxObjectCount) (yyval.xtokPullInstancePathsParmsList).maxObjectCount=(yyvsp[(2) - (2)].xtokPullInstancePathsParms).maxObjectCount; if ((yyvsp[(2) - (2)].xtokPullInstancePathsParms).enumerationContext) (yyval.xtokPullInstancePathsParmsList).enumerationContext=(yyvsp[(2) - (2)].xtokPullInstancePathsParms).enumerationContext; @@ -9858,7 +9864,7 @@ case 453: /* Line 1806 of yacc.c */ -#line 5963 "cimXmlOps.y" +#line 5964 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancePathsParms), 0, sizeof((yyval.xtokPullInstancePathsParms))); (yyval.xtokPullInstancePathsParms).maxObjectCount=atoi((yyvsp[(2) - (3)].xtokValue).value); @@ -9868,7 +9874,7 @@ case 454: /* Line 1806 of yacc.c */ -#line 5968 "cimXmlOps.y" +#line 5969 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancePathsParms), 0, sizeof((yyval.xtokPullInstancePathsParms))); } @@ -9877,7 +9883,7 @@ case 455: /* Line 1806 of yacc.c */ -#line 5972 "cimXmlOps.y" +#line 5973 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancePathsParms), 0, sizeof((yyval.xtokPullInstancePathsParms))); (yyval.xtokPullInstancePathsParms).enumerationContext=(yyvsp[(2) - (3)].enumerationContext); @@ -9887,7 +9893,7 @@ case 456: /* Line 1806 of yacc.c */ -#line 5977 "cimXmlOps.y" +#line 5978 "cimXmlOps.y" { memset(&(yyval.xtokPullInstancePathsParms), 0, sizeof((yyval.xtokPullInstancePathsParms))); } @@ -9896,7 +9902,7 @@ case 457: /* Line 1806 of yacc.c */ -#line 5988 "cimXmlOps.y" +#line 5989 "cimXmlOps.y" { (yyval.xtokCloseEnumeration).op.count = EI_REQ_REG_SEGMENTS; // TODO (yyval.xtokCloseEnumeration).op.type = OPS_CloseEnumeration; @@ -9912,7 +9918,7 @@ case 458: /* Line 1806 of yacc.c */ -#line 6006 "cimXmlOps.y" +#line 6007 "cimXmlOps.y" { (yyval.xtokEnumerationCount).op.count = EI_REQ_REG_SEGMENTS; // TODO (yyval.xtokEnumerationCount).op.type = OPS_EnumerationCount; @@ -9928,7 +9934,7 @@ case 459: /* Line 1806 of yacc.c */ -#line 6021 "cimXmlOps.y" +#line 6022 "cimXmlOps.y" { (yyval.enumerationContext)=atol((yyvsp[(1) - (2)].xtokValue).value); // TODO need some checking here } @@ -9937,7 +9943,7 @@ case 460: /* Line 1806 of yacc.c */ -#line 6028 "cimXmlOps.y" +#line 6029 "cimXmlOps.y" { } break; @@ -9945,7 +9951,7 @@ case 461: /* Line 1806 of yacc.c */ -#line 6040 "cimXmlOps.y" +#line 6041 "cimXmlOps.y" { (yyval.xtokInstanceName).className=(yyvsp[(1) - (2)].xtokInstanceName).className; (yyval.xtokInstanceName).bindings.next=0; @@ -9956,7 +9962,7 @@ case 462: /* Line 1806 of yacc.c */ -#line 6046 "cimXmlOps.y" +#line 6047 "cimXmlOps.y" { (yyval.xtokInstanceName).className=(yyvsp[(1) - (3)].xtokInstanceName).className; (yyval.xtokInstanceName).bindings=(yyvsp[(2) - (3)].xtokKeyBindings); @@ -9966,7 +9972,7 @@ case 463: /* Line 1806 of yacc.c */ -#line 6054 "cimXmlOps.y" +#line 6055 "cimXmlOps.y" { (yyval.xtokKeyBindings).next=1; (yyval.xtokKeyBindings).max=KEYBINDING_MAX_START; @@ -9981,7 +9987,7 @@ case 464: /* Line 1806 of yacc.c */ -#line 6064 "cimXmlOps.y" +#line 6065 "cimXmlOps.y" { if ((yyval.xtokKeyBindings).next == (yyval.xtokKeyBindings).max) { /* max was hit; let's bump it up 50% */ (yyval.xtokKeyBindings).max = (int)((yyval.xtokKeyBindings).max * ((float)3)/2); @@ -9998,7 +10004,7 @@ case 465: /* Line 1806 of yacc.c */ -#line 6079 "cimXmlOps.y" +#line 6080 "cimXmlOps.y" { (yyval.xtokKeyBinding).name=(yyvsp[(1) - (4)].xtokKeyBinding).name; (yyval.xtokKeyBinding).value=(yyvsp[(2) - (4)].xtokKeyValue).value; @@ -10009,7 +10015,7 @@ case 466: /* Line 1806 of yacc.c */ -#line 6085 "cimXmlOps.y" +#line 6086 "cimXmlOps.y" { (yyval.xtokKeyBinding).name=(yyvsp[(1) - (3)].xtokKeyBinding).name; (yyval.xtokKeyBinding).value=NULL; @@ -10021,7 +10027,7 @@ /* Line 1806 of yacc.c */ -#line 10025 "cimXmlOps.c" +#line 10031 "cimXmlOps.c" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -10071,7 +10077,7 @@ { ++yynerrs; #if ! YYERROR_VERBOSE - yyerror (YY_("syntax error")); + yyerror (parm, YY_("syntax error")); #else # define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \ yyssp, yytoken) @@ -10098,7 +10104,7 @@ yymsgp = yymsg; } } - yyerror (yymsgp); + yyerror (parm, yymsgp); if (yysyntax_error_status == 2) goto yyexhaustedlab; } @@ -10122,7 +10128,7 @@ else { yydestruct ("Error: discarding", - yytoken, &yylval); + yytoken, &yylval, parm); yychar = YYEMPTY; } } @@ -10178,7 +10184,7 @@ yydestruct ("Error: popping", - yystos[yystate], yyvsp); + yystos[yystate], yyvsp, parm); YYPOPSTACK (1); yystate = *yyssp; YY_STACK_PRINT (yyss, yyssp); @@ -10213,7 +10219,7 @@ | yyexhaustedlab -- memory exhaustion comes here. | `-------------------------------------------------*/ yyexhaustedlab: - yyerror (YY_("memory exhausted")); + yyerror (parm, YY_("memory exhausted")); yyresult = 2; /* Fall through. */ #endif @@ -10225,7 +10231,7 @@ user semantic actions for why this is necessary. */ yytoken = YYTRANSLATE (yychar); yydestruct ("Cleanup: discarding lookahead", - yytoken, &yylval); + yytoken, &yylval, parm); } /* Do not reclaim the symbols of the rule which action triggered this YYABORT or YYACCEPT. */ @@ -10234,7 +10240,7 @@ while (yyssp != yyss) { yydestruct ("Cleanup: popping", - yystos[*yyssp], yyvsp); + yystos[*yyssp], yyvsp, parm); YYPOPSTACK (1); } #ifndef yyoverflow @@ -10252,6 +10258,6 @@ /* Line 2067 of yacc.c */ -#line 6093 "cimXmlOps.y" +#line 6094 "cimXmlOps.y" diff -Nru sblim-sfcb-1.4.6/cimXmlOps.h sblim-sfcb-1.4.8/cimXmlOps.h --- sblim-sfcb-1.4.6/cimXmlOps.h 2013-10-02 15:24:53.000000000 +0000 +++ sblim-sfcb-1.4.8/cimXmlOps.h 2014-03-26 23:56:52.000000000 +0000 @@ -323,7 +323,7 @@ { /* Line 2068 of yacc.c */ -#line 1810 "cimXmlOps.y" +#line 1811 "cimXmlOps.y" int intValue; char boolValue; diff -Nru sblim-sfcb-1.4.6/cimXmlOps.y sblim-sfcb-1.4.8/cimXmlOps.y --- sblim-sfcb-1.4.6/cimXmlOps.y 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/cimXmlOps.y 2014-03-26 23:46:28.000000000 +0000 @@ -72,7 +72,7 @@ -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 @@ %} %pure_parser +%parse-param { void* parm } /* **============================================================================== @@ -2530,7 +2531,7 @@ : XTOK_PARAMVALUE ZTOK_PARAMVALUE { $$.value.value=NULL; - $$.type=-1; + $$.type=0; } | XTOK_PARAMVALUE value ZTOK_PARAMVALUE { @@ -3300,7 +3301,7 @@ $$.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 @@ $$.properties=$2.properties; setRequest(parm,&$$,sizeof(XtokModifyInstance),OPS_ModifyInstance); - if (buildModifyInstanceRequest(parm)) yyerror("Invalid Parameter"); + if (buildModifyInstanceRequest(parm)) yyerror(parm, "Invalid Parameter"); } ; diff -Nru sblim-sfcb-1.4.6/cimXmlParser.c sblim-sfcb-1.4.8/cimXmlParser.c --- sblim-sfcb-1.4.6/cimXmlParser.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/cimXmlParser.c 2014-03-26 23:46:28.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: cimXmlParser.c,v 1.33 2009/06/05 20:09:34 buccella Exp $ + * $Id: cimXmlParser.c c29c15e on Wed Feb 19 18:47:31 2014 -0500 by Dave Heller $ * * © Copyright IBM Corp. 2005, 2007 * @@ -1696,8 +1696,12 @@ _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 -Nru sblim-sfcb-1.4.6/cimXmlParserProcessed.c sblim-sfcb-1.4.8/cimXmlParserProcessed.c --- sblim-sfcb-1.4.6/cimXmlParserProcessed.c 2013-10-02 15:24:53.000000000 +0000 +++ sblim-sfcb-1.4.8/cimXmlParserProcessed.c 2014-03-26 23:56:52.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: cimXmlParser.c,v 1.33 2009/06/05 20:09:34 buccella Exp $ + * $Id: cimXmlParser.c c29c15e on Wed Feb 19 18:47:31 2014 -0500 by Dave Heller $ * * © Copyright IBM Corp. 2005, 2007 * @@ -1696,8 +1696,12 @@ _SFCB_RETURN(0); } +/* + * The bison %parse-param directive modifies the sfcXmlerror() signature as well as + * sfcXmlparse(), so we must handle the extra parm even though we don't use it. + */ int -sfcXmlerror(char *s) +sfcXmlerror(void __attribute__ ((unused)) *parm, char *s) { printf("*-* sfcXmlerror: %s\n", s); return 5; diff -Nru sblim-sfcb-1.4.6/classProviderGz.c sblim-sfcb-1.4.8/classProviderGz.c --- sblim-sfcb-1.4.6/classProviderGz.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/classProviderGz.c 2014-03-26 23:46:28.000000000 +0000 @@ -101,6 +101,8 @@ static int nsBaseLen; +extern unsigned long exFlags; + static void buildInheritanceTable(ClassRegister * cr) { @@ -458,6 +460,12 @@ continue; if (strcmp(de->d_name, "..") == 0) continue; + if (!(exFlags & 2)) { + /* enforce enableInterOp = false [sfcb#90] */ + if (strncmp(de->d_name, "interop", 7) == 0) { + continue; + } + } l = strlen(dn) + strlen(de->d_name) + 4; n = malloc(l + 8); strcpy(n, dn); diff -Nru sblim-sfcb-1.4.6/classProviderMem.c sblim-sfcb-1.4.8/classProviderMem.c --- sblim-sfcb-1.4.6/classProviderMem.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/classProviderMem.c 2014-03-26 23:46:28.000000000 +0000 @@ -1,7 +1,7 @@ /* - * $Id: classProviderMem.c,v 1.11 2009/12/17 20:15:48 buccella Exp $ + * $Id: classProviderMem.c 33fe8f3 on Thu Jul 18 13:10:14 2013 -0400 by buccella $ * * (C) Copyright IBM Corp. 2006 * diff -Nru sblim-sfcb-1.4.6/classProviderSf.c sblim-sfcb-1.4.8/classProviderSf.c --- sblim-sfcb-1.4.6/classProviderSf.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/classProviderSf.c 2014-03-26 23:46:28.000000000 +0000 @@ -128,6 +128,8 @@ static int nsBaseLen; +extern unsigned long exFlags; + static void buildInheritanceTable(ClassRegister * cr) { @@ -480,6 +482,12 @@ continue; if (strcmp(de->d_name, "..") == 0) continue; + if (!(exFlags & 2)) { + /* enforce enableInterOp = false [sfcb#90] */ + if (strncmp(de->d_name, "interop", 7) == 0) { + continue; + } + } l = strlen(dn) + strlen(de->d_name) + 4; n = malloc(l + 8); strcpy(n, dn); diff -Nru sblim-sfcb-1.4.6/classSchemaMem.c sblim-sfcb-1.4.8/classSchemaMem.c --- sblim-sfcb-1.4.6/classSchemaMem.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/classSchemaMem.c 2014-03-26 23:46:28.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: classSchemaMem.c,v 1.3 2006/10/25 16:59:43 mihajlov Exp $ + * $Id: classSchemaMem.c 3558a8a on Thu Feb 25 16:06:54 2010 -0500 by Sean Swehla $ * * (C) Copyright IBM Corp. 2006 * diff -Nru sblim-sfcb-1.4.6/configure sblim-sfcb-1.4.8/configure --- sblim-sfcb-1.4.6/configure 2013-10-02 15:31:21.000000000 +0000 +++ sblim-sfcb-1.4.8/configure 2014-03-26 23:56:16.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for Small Footprint CIM Broker 1.4.6. +# Generated by GNU Autoconf 2.68 for Small Footprint CIM Broker 1.4.8. # # Report bugs to . # @@ -570,8 +570,8 @@ # Identity of this package. PACKAGE_NAME='Small Footprint CIM Broker' PACKAGE_TARNAME='sblim-sfcb' -PACKAGE_VERSION='1.4.6' -PACKAGE_STRING='Small Footprint CIM Broker 1.4.6' +PACKAGE_VERSION='1.4.8' +PACKAGE_STRING='Small Footprint CIM Broker 1.4.8' PACKAGE_BUGREPORT='sblim-devel@lists.sourceforge.net' PACKAGE_URL='' @@ -1400,7 +1400,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Small Footprint CIM Broker 1.4.6 to adapt to many kinds of systems. +\`configure' configures Small Footprint CIM Broker 1.4.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1470,7 +1470,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Small Footprint CIM Broker 1.4.6:";; + short | recursive ) echo "Configuration of Small Footprint CIM Broker 1.4.8:";; esac cat <<\_ACEOF @@ -1608,7 +1608,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Small Footprint CIM Broker configure 1.4.6 +Small Footprint CIM Broker configure 1.4.8 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2209,7 +2209,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Small Footprint CIM Broker $as_me 1.4.6, which was +It was created by Small Footprint CIM Broker $as_me 1.4.8, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3032,7 +3032,7 @@ # Define the identity of the package. PACKAGE='sblim-sfcb' - VERSION='1.4.6' + VERSION='1.4.8' cat >>confdefs.h <<_ACEOF @@ -16066,7 +16066,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Small Footprint CIM Broker $as_me 1.4.6, which was +This file was extended by Small Footprint CIM Broker $as_me 1.4.8, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16132,7 +16132,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Small Footprint CIM Broker config.status 1.4.6 +Small Footprint CIM Broker config.status 1.4.8 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru sblim-sfcb-1.4.6/configure.ac sblim-sfcb-1.4.8/configure.ac --- sblim-sfcb-1.4.6/configure.ac 2013-10-02 15:25:52.000000000 +0000 +++ sblim-sfcb-1.4.8/configure.ac 2014-03-26 23:50:52.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.106 2010/02/18 18:53:28 buccella Exp $ +# $Id: configure.ac b954c94 on Sun Dec 29 12:18:36 2013 -0500 by Dave Heller $ # # configure.ac # @@ -22,7 +22,7 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(Small Footprint CIM Broker, 1.4.6, sblim-devel@lists.sourceforge.net, sblim-sfcb) +AC_INIT(Small Footprint CIM Broker, 1.4.8, sblim-devel@lists.sourceforge.net, sblim-sfcb) AC_CONFIG_SRCDIR([providerDrv.c]) #disable "seems to ignore the --datarootdir setting" warnings diff -Nru sblim-sfcb-1.4.6/context.c sblim-sfcb-1.4.8/context.c --- sblim-sfcb-1.4.6/context.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/context.c 2014-03-26 23:46:28.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: context.c,v 1.13 2009/08/10 22:47:58 mchasal Exp $ + * $Id: context.c 3558a8a on Thu Feb 25 16:06:54 2010 -0500 by Sean Swehla $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/control.c sblim-sfcb-1.4.8/control.c --- sblim-sfcb-1.4.6/control.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/control.c 2014-03-26 23:46:28.000000000 +0000 @@ -71,6 +71,57 @@ char *ip4List= NULL; char *ip6List= NULL; +char **origArgv; +int origArgc; +int useCDATA; +unsigned int labelProcs; + +/** + * Kindly null terminate, always, even if might overwrite + * the last char of the truncated string. +*/ +inline char *strncpy_kind(char *to, char *from, size_t size) { + strncpy(to, from, size); + *(to + size - 1) = '\0'; + return to; +} + +/** + * Helper functions for labeling a process by modifying the process argv string. + * On the first call, convert the original argv[] to a contiguous string by + * replacing inter-arg nulls with spaces and adding a trailing space; then + * append appendstr. On subsequent calls only append appendstr. Passing + * NULL for appendstr forces the function to act as if called for the first + * time, i.e. reset the static ptr and prepare the argv[] string. + */ +void append2Argv(char *appendstr) { + int i; + static char *ptr = NULL; + if (!ptr || !appendstr) { /* called for the 1st time or intentionally reset */ + for (i=1 ; i < origArgc ; i++) + *(*(origArgv+i) - 1) = ' '; /* replace inter-arg nulls with spaces */ + ptr = origArgv[origArgc - 1]; + } + if (appendstr) + /* Enforce limit of appending no more than labelProcs chars */ + ptr += strlen(strncpy_kind(ptr, appendstr, + labelProcs - (ptr - origArgv[origArgc - 1]) + 1)); +} + +/** + * Restore the process argv[] to its original form by replacing inter-arg spaces + * with nulls. May be required prior to spawning a child process. To prepare for + * a full restart, additionally remove the pad argument. + */ +void restoreOrigArgv(int removePad) { + int i; + for (i=1 ; i < origArgc ; i++) + *(*(origArgv+i) - 1) = '\0'; /* restore inter-arg nulls */ + + if (removePad) + origArgv[origArgc - 1] = NULL; +} + /* Control initial values { property, type, string value, numeric value} */ static Control init[] = { @@ -99,6 +150,7 @@ {"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}}, @@ -117,6 +169,9 @@ {"sslCertificateFilePath", CTL_STRING, SFCB_CONFDIR "/server.pem", {0}}, {"sslCertList", CTL_STRING, SFCB_CONFDIR "/clist.pem", {0}}, {"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}}, @@ -147,6 +202,8 @@ {"MaxListenerDestinations", CTL_LONG, NULL, {.slong=100}}, {"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 -Nru sblim-sfcb-1.4.6/control.h sblim-sfcb-1.4.8/control.h --- sblim-sfcb-1.4.6/control.h 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/control.h 2014-03-26 23:46:28.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: control.h,v 1.4 2009/03/24 19:02:19 smswehla Exp $ + * $Id: control.h c89835c on Tue Jan 15 16:20:24 2013 -0500 by buccella $ * * (C) Copyright IBM Corp. 2005 * diff -Nru sblim-sfcb-1.4.6/debian/changelog sblim-sfcb-1.4.8/debian/changelog --- sblim-sfcb-1.4.6/debian/changelog 2014-01-24 17:54:27.000000000 +0000 +++ sblim-sfcb-1.4.8/debian/changelog 2014-06-30 17:38:18.000000000 +0000 @@ -1,3 +1,42 @@ +sblim-sfcb (1.4.8-0ubuntu1) utopic; urgency=low + + * new upstream release (LP: #1335907) + * 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 + - [sfcb-tix:#86] Support configurable SSL Diffie Hellman parameters file + - [sfcb-tix:#87] Support configurable SSL ECDH elliptic curve name + - [sfcb-tix:#76] Identify running SFCB processes in ps output + * bug fixes: + - [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 + - [sfcb-tix:#61] classProviderSf.c SIGSEGV if repo is not initialized + - [sfcb-tix:#63] Improve NamespaceProvider and ClassProvider Consistency + - [sfcb-tix:#66] SFCB_TRACE_VAR should be more restrictive + - [sfcb-tix:#60] fix providerMgr trace for localconnect + - [sfcb-tix:#68] reinitialize select timeout in SSL handshake + - [sfcb-tix:#79] sfcc cannot reconnect with sfcb if sfcb restarts + [bugs:#2663] + - [sfcb-tix:#69] Fix logger for long-lived clients, was: + "#2347 Don't spawn logger for clients" + - [sfcb-tix:#72] Make systemddir configurable + - [sfcb-tix:#74] providerRegister: check for and prevent buffer overflows + - [sfcb-tix:#75] fileRepository: show which directory could not be opened + - [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:#77] Fix prototype for stopBroker + - [sfcb-tix:#80] sfcc cannot reconnect with sfcb + -- Kent Baxley Wed, 25 Jun 2014 11:38:45 -0500 + sblim-sfcb (1.4.6-0ubuntu4) trusty; urgency=low * Use dh-autoreconf for newer arches, resolving FTBFS. diff -Nru sblim-sfcb-1.4.6/debian/control sblim-sfcb-1.4.8/debian/control --- sblim-sfcb-1.4.6/debian/control 2014-01-24 17:35:40.000000000 +0000 +++ sblim-sfcb-1.4.8/debian/control 2014-06-25 17:00:59.000000000 +0000 @@ -14,7 +14,7 @@ libsfcutil0-dev (>=1.0.0) Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Dave Heller -Standards-Version: 3.9.4 +Standards-Version: 3.9.5 Package: sfcb Architecture: any diff -Nru sblim-sfcb-1.4.6/debian/patches/automake_srcdir.patch sblim-sfcb-1.4.8/debian/patches/automake_srcdir.patch --- sblim-sfcb-1.4.6/debian/patches/automake_srcdir.patch 2014-01-24 17:53:36.000000000 +0000 +++ sblim-sfcb-1.4.8/debian/patches/automake_srcdir.patch 2014-06-25 16:59:03.000000000 +0000 @@ -1,20 +1,6 @@ -Index: sblim-sfcb-1.4.6/test/TestProviders/tests/Makefile.am -=================================================================== ---- sblim-sfcb-1.4.6.orig/test/TestProviders/tests/Makefile.am 2013-10-02 11:24:02.000000000 -0400 -+++ sblim-sfcb-1.4.6/test/TestProviders/tests/Makefile.am 2014-01-24 12:49:54.574321321 -0500 -@@ -31,5 +31,5 @@ - endif - - #Some wbemcat tests --export SRCDIR=$(srcdir) --TESTS = $(srcdir)/xmltest.sh $(srcdir)/IndRetryTest.sh $(srcdir)/limitTest.sh -+export SRCDIR=$(top_srcdir) -+TESTS = $(SRCDIR)/xmltest.sh $(SRCDIR)/IndRetryTest.sh $(SRCDIR)/limitTest.sh -Index: sblim-sfcb-1.4.6/mofc/Makefile.am -=================================================================== ---- sblim-sfcb-1.4.6.orig/mofc/Makefile.am 2013-10-02 11:24:04.000000000 -0400 -+++ sblim-sfcb-1.4.6/mofc/Makefile.am 2014-01-24 12:53:19.180709925 -0500 -@@ -21,7 +21,7 @@ +--- sblim-sfcb-1.4.8.orig/mofc/Makefile.am ++++ sblim-sfcb-1.4.8/mofc/Makefile.am +@@ -21,7 +21,7 @@ endif mofc_SOURCES=mofc.y mofs.l mofparse.c hash.h hash.c symtab.h symtab.c mofdecl.h backend.h EXTRA_mofc_SOURCES=backend_print.c backend_sfcb.c mofc_DEPENDENCIES=mofc-@BACKEND_OBJ@ @@ -23,3 +9,12 @@ mofc_CPPFLAGS=@BACKEND_INCLUDES@ EXTRA_DIST=runtest.sh tests/test1.mof tests/include/test2.mof \ +--- sblim-sfcb-1.4.8.orig/test/TestProviders/tests/Makefile.am ++++ sblim-sfcb-1.4.8/test/TestProviders/tests/Makefile.am +@@ -31,5 +31,5 @@ else + endif + + #Some wbemcat tests +-export SRCDIR=$(srcdir) ++export SRCDIR=$(top_srcdir) + TESTS = xmltest.sh IndRetryTest.sh limitTest.sh diff -Nru sblim-sfcb-1.4.6/debian/patches/xmltest-uses-bash.diff sblim-sfcb-1.4.8/debian/patches/xmltest-uses-bash.diff --- sblim-sfcb-1.4.6/debian/patches/xmltest-uses-bash.diff 2010-06-28 07:49:58.000000000 +0000 +++ sblim-sfcb-1.4.8/debian/patches/xmltest-uses-bash.diff 2014-06-25 16:52:35.000000000 +0000 @@ -3,10 +3,10 @@ Origin: Ubuntu Last-Update: 2010-06-28 -Index: sblim-sfcb-1.3.8/xmltest +Index: sblim-sfcb-1.4.8/xmltest =================================================================== ---- sblim-sfcb-1.3.8.orig/xmltest -+++ sblim-sfcb-1.3.8/xmltest +--- sblim-sfcb-1.4.8.orig/xmltest ++++ sblim-sfcb-1.4.8/xmltest @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash diff -Nru sblim-sfcb-1.4.6/debian/rules sblim-sfcb-1.4.8/debian/rules --- sblim-sfcb-1.4.6/debian/rules 2014-01-24 17:34:50.000000000 +0000 +++ sblim-sfcb-1.4.8/debian/rules 2014-06-25 17:03:27.000000000 +0000 @@ -31,6 +31,8 @@ dh_testdir $(MAKE) touch build-stamp +build-arch: build-stamp +build-indep: build-stamp clean: dh_testdir diff -Nru sblim-sfcb-1.4.6/fileRepository.c sblim-sfcb-1.4.8/fileRepository.c --- sblim-sfcb-1.4.6/fileRepository.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/fileRepository.c 2014-03-26 23:46:28.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: fileRepository.c,v 1.20 2009/11/09 21:03:30 buccella Exp $ + * $Id: fileRepository.c 369f536 on Fri Sep 20 15:54:02 2013 -0400 by buccella $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/httpAdapter.c sblim-sfcb-1.4.8/httpAdapter.c --- sblim-sfcb-1.4.6/httpAdapter.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/httpAdapter.c 2014-03-26 23:46:28.000000000 +0000 @@ -229,10 +229,15 @@ #define TERMINATE(x) { if (!doFork) _SFCB_RETURN(x); commClose(conn_fd); exit(x); } void -initHttpProcCtl(int p) +initHttpProcCtl(int p, int adapterNum) { - httpProcSemKey = ftok(SFCB_BINARY, 'H'); - httpWorkSemKey = ftok(SFCB_BINARY, 'W'); + /* + * ftok uses only the lowest 8 bits of proj_id, for 256 possible keys per + * pathname. We need two keys per pathname per process, so we can support + * up to 128 adapters before colliding. + * */ + httpProcSemKey = ftok(SFCB_BINARY, adapterNum + 0); + httpWorkSemKey = ftok(SFCB_BINARY, adapterNum + 127); union semun sun; int i; @@ -264,7 +269,7 @@ semget(httpWorkSemKey, 1, IPC_CREAT | IPC_EXCL | 0600)) == -1) { char *emsg = strerror(errno); mlogf(M_ERROR, M_SHOW, - "\n--- Http ProcWork semaphore create key: 0x%x failed: %s\n", + "\n--- Http Work semaphore create key: 0x%x failed: %s\n", httpWorkSemKey, emsg); mlogf(M_ERROR, M_SHOW, " use \"ipcrm -S 0x%x\" to remove semaphore\n\n", @@ -1444,7 +1449,6 @@ CommHndl conn_fd; int isReady; fd_set httpfds; - // struct sembuf procReleaseUnDo = { 0, 1, SEM_UNDO }; struct timeval httpTimeout; int breakloop; @@ -1454,10 +1458,16 @@ _SFCB_TRACE(1, ("--- Forking request processor")); semAcquire(httpWorkSem, 0); semAcquire(httpProcSem, 0); - for (httpProcIdX = 0; httpProcIdX < hMax; httpProcIdX++) - if (semGetValue(httpProcSem, httpProcIdX + 1) == 0) + for (httpProcIdX = 1; httpProcIdX <= hMax; httpProcIdX++) + if (semGetValue(httpProcSem, httpProcIdX) == 0) break; - // procReleaseUnDo.sem_num = httpProcIdX + 1; + + /* This should not happen, but if it does exit the req handler gracefully */ + if (httpProcIdX > hMax) { + semRelease(httpProcSem, 0); + semRelease(httpWorkSem, 0); + return; + } sessionId++; r = fork(); @@ -1470,11 +1480,21 @@ processName = "CIMREQ-Processor"; semRelease(httpProcSem, 0); semAcquireUnDo(httpProcSem, 0); - semReleaseUnDo(httpProcSem, httpProcIdX + 1); + semReleaseUnDo(httpProcSem, httpProcIdX); semRelease(httpWorkSem, 0); atexit(releaseAuthHandle); atexit(uninitGarbageCollector); atexit(sunsetControl); + + /* Label the process by modifying the cmdline */ + extern void append2Argv(char *appendstr); + extern unsigned int labelProcs; + if (labelProcs) { + append2Argv(" -reqhandler: "); + char handlerId[8]; + sprintf(handlerId, "%d", httpProcIdX); + append2Argv(handlerId); + } } /* * parent's thread of execution @@ -2015,8 +2035,10 @@ *fnt, *fnl, *fcert, + *fdhp, *sslCiphers; - int rc; + int rc, + escsp; if (ctx) SSL_CTX_free(ctx); @@ -2062,10 +2084,17 @@ } /* - * 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 */ @@ -2074,12 +2103,57 @@ if (SSL_CTX_set_cipher_list(ctx, sslCiphers) != 1) intSSLerror("Error setting cipher list (no valid ciphers)"); +#if (defined HEADER_DH_H && !defined OPENSSL_NO_DH) + /* + * Set DH parameters file for ephemeral key generation + */ + getControlChars("sslDhParamsFilePath", &fdhp); + if (fdhp) { + _SFCB_TRACE(1, ("--- sslDhParamsFilePath = %s", fdhp)); + BIO *dhpbio = BIO_new_file(fdhp, "r"); + DH *dh_tmp = PEM_read_bio_DHparams(dhpbio, NULL, NULL, NULL); + BIO_free(dhpbio); + if (dh_tmp) { + SSL_CTX_set_tmp_dh(ctx, dh_tmp); + DH_free(dh_tmp); + } else { + unsigned long sslqerr = ERR_get_error(); + mlogf(M_ERROR,M_SHOW,"--- Failure reading DH params file: %s (%s)\n", + fdhp, sslqerr != 0 ? ERR_error_string(sslqerr, NULL) : + "unknown openssl error"); + intSSLerror("Error setting DH params for SSL"); + } + } +#endif // HEADER_DH_H + +#if (defined HEADER_EC_H && !defined OPENSSL_NO_EC) + /* + * Set ECDH curve name for ephemeral key generation + */ + char *ecdh_curve_name; + getControlChars("sslEcDhCurveName", &ecdh_curve_name); + if (ecdh_curve_name) { + _SFCB_TRACE(1, ("--- sslEcDhCurveName = %s", ecdh_curve_name)); + EC_KEY *ecdh = EC_KEY_new_by_curve_name(OBJ_sn2nid(ecdh_curve_name)); + if (ecdh) { + SSL_CTX_set_tmp_ecdh(ctx, ecdh); + EC_KEY_free(ecdh); + } else { + unsigned long sslqerr = ERR_get_error(); + mlogf(M_ERROR, M_SHOW, "--- Failure setting ECDH curve name (%s): %s\n", + ecdh_curve_name, sslqerr != 0 ? + ERR_error_string(sslqerr, NULL ) : "unknown openssl error"); + intSSLerror("Error setting ECDH curve name for SSL"); + } + } +#endif // HEADER_EC_H + sslReloadRequested = 0; } #endif // USE_SSL int -httpDaemon(int argc, char *argv[], int sslMode, char *ipAddr, +httpDaemon(int argc, char *argv[], int sslMode, int adapterNum, char *ipAddr, sa_family_t ipAddrFam, int sfcbPid) { @@ -2159,7 +2233,7 @@ doFork = 0; } - initHttpProcCtl(hMax); + initHttpProcCtl(hMax, adapterNum); if (getControlBool("doBasicAuth", &doBa)) doBa = 0; @@ -2236,6 +2310,26 @@ keepaliveMaxRequest); } + /* Label the process by modifying the cmdline */ + extern void append2Argv(char *appendstr); + extern unsigned int labelProcs; + if (labelProcs) { + append2Argv(NULL); + append2Argv("-proc:HttpDaemon "); + append2Argv("-ip:"); + char *l = ""; + char *r = ""; +#ifdef HAVE_IPV6 + if (ipAddrFam == AF_INET6) { + l = "["; + r = "]"; + } +#endif + append2Argv(l); + append2Argv(ipAddr); + append2Argv(r); + } + if (enableHttp) { httpListenFd = getSocket(ipAddrFam); } diff -Nru sblim-sfcb-1.4.6/indCIMXMLExport.c sblim-sfcb-1.4.8/indCIMXMLExport.c --- sblim-sfcb-1.4.6/indCIMXMLExport.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/indCIMXMLExport.c 2014-03-26 23:46:29.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: indCIMXMLExport.c,v 1.14 2010/01/21 21:50:37 mchasal Exp $ + * $Id: indCIMXMLExport.c e984e37 on Thu Feb 20 20:38:27 2014 -0500 by Dave Heller $ * * © Copyright IBM Corp. 2005, 2007 * @@ -238,6 +238,16 @@ 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 + ":" + @@ -248,6 +258,10 @@ // Initialize default headers initializeHeaders(cd); + /* Curl does Expect:100-continue unless we tell it not to */ + 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 -Nru sblim-sfcb-1.4.6/indCIMXMLHandler.c sblim-sfcb-1.4.8/indCIMXMLHandler.c --- sblim-sfcb-1.4.6/indCIMXMLHandler.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/indCIMXMLHandler.c 2014-03-26 23:46:29.000000000 +0000 @@ -737,8 +737,8 @@ struct timezone tz; int rint, maxcount, - ract, - rtint; + ract; + CMPIUint32 rtint; CMPIUint64 sfc = 0; CMPIObjectPath *op; CMPIEnumeration *isenm = NULL; @@ -834,7 +834,7 @@ 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 -Nru sblim-sfcb-1.4.6/instance.c sblim-sfcb-1.4.8/instance.c --- sblim-sfcb-1.4.6/instance.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/instance.c 2014-03-26 23:46:29.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: instance.c,v 1.45 2008/11/21 20:23:51 mchasal Exp $ + * $Id: instance.c 92848af on Fri Oct 18 15:08:31 2013 -0400 by buccella $ * * © Copyright IBM Corp. 2005, 2007 * @@ -576,6 +576,80 @@ return cop; } +/* same as ift_gOP(), but used for SfcbLocal clients + eliminated klt hashtable, call mm to release tracked + CMPI objects before exiting */ +static CMPIObjectPath * +__iftLocal_getObjectPath(const CMPIInstance *instance, CMPIStatus *rc) +{ + int j, + f = 0; + CMPIStatus tmp; + const char *cn; + const char *ns; + void* hc; + + if (!instance->hdl) { + if (rc) + CMSetStatus(rc, CMPI_RC_ERR_INVALID_HANDLE); + return NULL; + } + + cn = ClInstanceGetClassName((ClInstance *) instance->hdl); + ns = ClInstanceGetNameSpace((ClInstance *) instance->hdl); + + CMPIObjectPath *cop = TrackedCMPIObjectPath(ns, cn, rc); + + if (rc && rc->rc != CMPI_RC_OK) + return NULL; + + j = __ift_getPropertyCount(instance, NULL); + + hc = markHeap(); + while (j--) { + char *keyName; + CMPIData d = + __ift_internal_getPropertyAt(instance, j, &keyName, &tmp, 1, NULL); + if (d.state & CMPI_keyValue) { + CMAddKey(cop, keyName, &d.value, d.type); + f++; + } + if (d.type & CMPI_ARRAY && (d.state & CMPI_nullValue) == 0) { + d.value.array->ft->release(d.value.array); + } + } + + if (f == 0) { + CMPIArray *kl; + CMPIData d; + unsigned int e, + m; + + CMPIConstClass *cc = getConstClass(ns, cn); + if (cc) { + kl = cc->ft->getKeyList(cc); + } else { + if (rc) { + CMSetStatus(rc, CMPI_RC_ERR_INVALID_CLASS); + } + releaseHeap(hc); + return NULL; + } + m = kl->ft->getSize(kl, NULL); + + for (e = 0; e < m; e++) { + CMPIString *n = kl->ft->getElementAt(kl, e, NULL).value.string; + d = __ift_getProperty(instance, CMGetCharPtr(n), &tmp); + if (tmp.rc == CMPI_RC_OK) { + CMAddKey(cop, CMGetCharPtr(n), &d.value, d.type); + } + } + CMRelease(kl); + } + releaseHeap(hc); + return cop; +} + static CMPIStatus __ift_internal_setPropertyFilter(CMPIInstance *instance, const char **propertyList, const char **keys) @@ -852,7 +926,7 @@ __ift_getPropertyAt, __ift_getPropertyCount, __ift_setProperty, - __ift_getObjectPath, + __iftLocal_getObjectPath, __ift_setPropertyFilter, __ift_getQualifier, __ift_getQualifierAt, diff -Nru sblim-sfcb-1.4.6/internalProvider.h sblim-sfcb-1.4.8/internalProvider.h --- sblim-sfcb-1.4.6/internalProvider.h 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/internalProvider.h 2014-03-26 23:46:29.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: internalProvider.h,v 1.7 2009/05/08 00:04:33 mchasal Exp $ + * $Id: internalProvider.h 034a6e8 on Mon May 9 16:43:42 2011 -0400 by buccella $ * * (C) Copyright IBM Corp. 2005 * diff -Nru sblim-sfcb-1.4.6/interopProvider.c sblim-sfcb-1.4.8/interopProvider.c --- sblim-sfcb-1.4.6/interopProvider.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/interopProvider.c 2014-03-26 23:46:29.000000000 +0000 @@ -1605,6 +1605,7 @@ di->ctx = native_clone_CMPIContext(ctx); di->hop = CMClone(su->ha->hop, NULL); di->hin = CMClone(hin, NULL); + errno = 0; if (IND_THREAD_TO > 0) { availThreadWait.tv_sec = time(NULL) + IND_THREAD_TO; while ((sem_timedwait(&availThreadsSem, &availThreadWait)) == -1) { @@ -1619,6 +1620,14 @@ else { sem_wait(&availThreadsSem); } + /* + * This is a shortcut, but errno is thread-safe and this could only + * be true if set by sem_timedwait(). + */ + if (errno == ETIMEDOUT) { + _SFCB_TRACE(2,("--- Timedout waiting to create indication delivery thread")); + break; + } int pcrc = pthread_create(&ind_thread, &it_attr,&sendIndForDelivery,(void *) di); _SFCB_TRACE(1,("--- indication delivery thread status: %d", pcrc)); diff -Nru sblim-sfcb-1.4.6/Makefile.am sblim-sfcb-1.4.8/Makefile.am --- sblim-sfcb-1.4.6/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/Makefile.am 2014-03-26 23:46:27.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 10a7037 on Fri Sep 20 14:16:05 2013 -0400 by buccella $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/Makefile.in sblim-sfcb-1.4.8/Makefile.in --- sblim-sfcb-1.4.6/Makefile.in 2013-10-02 15:31:20.000000000 +0000 +++ sblim-sfcb-1.4.8/Makefile.in 2014-03-26 23:56:15.000000000 +0000 @@ -69,8 +69,8 @@ $(top_srcdir)/man/sfcbuuid.1.pre.in \ $(top_srcdir)/man/wbemcat.1.pre.in \ $(top_srcdir)/man/xmltest.1.pre.in AUTHORS COPYING ChangeLog \ - INSTALL NEWS cimXmlOps.c cimXmlOps.h compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing queryLexer.c \ + INSTALL NEWS cimXmlOps.c cimXmlOps.h config.guess config.sub \ + depcomp install-sh ltmain.sh missing queryLexer.c \ queryParser.c queryParser.h ylwrap ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ @@ -596,7 +596,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 10a7037 on Fri Sep 20 14:16:05 2013 -0400 by buccella $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/man/sfcbd.1.pre.in sblim-sfcb-1.4.8/man/sfcbd.1.pre.in --- sblim-sfcb-1.4.6/man/sfcbd.1.pre.in 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/man/sfcbd.1.pre.in 2014-03-26 23:46:29.000000000 +0000 @@ -248,6 +248,15 @@ .br [Note: not currently ever used] .TP +.B SFCB_LABELPROCS +If set to a positive integer value, enable the process labeling feature. +This adds a description of each process' role to the process cmdline +so that it appears in 'ps' output. The identifying info will be appended +to the original arv data, following any passed arguments. The number of bytes +appended is limited by the value of SFCB_LABELPROCS. A value of about 100 +should be enough in most cases. A smaller value may truncate the data, but +this may be desired. To disable, set the vaue to zero, or unset the env var. +.TP .B SBLIM_TRACE Specifies the level of trace/debug messages for SBLIM providers. Valid values are 0 (no trace messages), or 1 (key trace messages only) diff -Nru sblim-sfcb-1.4.6/mlog.c sblim-sfcb-1.4.8/mlog.c --- sblim-sfcb-1.4.6/mlog.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/mlog.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: mlog.c,v 1.10 2009/08/07 23:31:13 mchasal Exp $ + * $Id: mlog.c 2fd9b09 on Thu Oct 31 19:00:18 2013 -0400 by Dave Heller $ * * (C) Copyright IBM Corp. 2003, 2004 * @@ -19,7 +19,7 @@ */ const char *_mlog_id = - "$Id: mlog.c,v 1.10 2009/08/07 23:31:13 mchasal Exp $"; + "$Id: mlog.c 2fd9b09 on Thu Oct 31 19:00:18 2013 -0400 by Dave Heller $"; #include "mlog.h" #include "msgqueue.h" @@ -109,6 +109,13 @@ setSignal(SIGHUP, SIG_IGN, 0); setSignal(SIGUSR2, SIG_IGN, 0); + /* Label the process by modifying the cmdline */ + extern void append2Argv(char *appendstr); + extern unsigned int labelProcs; + if (labelProcs) { + append2Argv("-proc:Logger"); + } + runLogger(logfds[0], level); close(logfds[0]); diff -Nru sblim-sfcb-1.4.6/mlog.h sblim-sfcb-1.4.8/mlog.h --- sblim-sfcb-1.4.6/mlog.h 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/mlog.h 2014-03-26 23:46:30.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: mlog.h,v 1.5 2009/08/07 23:31:13 mchasal Exp $ + * $Id: mlog.h 66e4ab2 on Wed Sep 18 15:19:08 2013 -0400 by buccella $ * * (C) Copyright IBM Corp. 2003, 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/backend.h sblim-sfcb-1.4.8/mofc/backend.h --- sblim-sfcb-1.4.6/mofc/backend.h 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/backend.h 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: backend.h,v 1.3 2006/10/27 13:14:21 sschuetz Exp $ + * $Id: backend.h 94dde90 on Fri Oct 27 13:14:21 2006 +0000 by sschuetz $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/backend_print.c sblim-sfcb-1.4.8/mofc/backend_print.c --- sblim-sfcb-1.4.6/mofc/backend_print.c 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/backend_print.c 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: backend_print.c,v 1.4 2009/01/08 16:46:33 buccella Exp $ + * $Id: backend_print.c fd29622 on Thu Jan 8 16:46:33 2009 +0000 by buccella $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/backend_sfcb.c sblim-sfcb-1.4.8/mofc/backend_sfcb.c --- sblim-sfcb-1.4.6/mofc/backend_sfcb.c 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/backend_sfcb.c 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: backend_sfcb.c,v 1.21 2009/12/22 00:18:29 buccella Exp $ + * $Id: backend_sfcb.c 19eb612 on Thu Mar 14 14:57:58 2013 -0400 by buccella $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/hash.c sblim-sfcb-1.4.8/mofc/hash.c --- sblim-sfcb-1.4.6/mofc/hash.c 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/hash.c 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: hash.c,v 1.2 2005/11/20 17:37:05 bestorga-oss Exp $ + * $Id: hash.c 212ca5c on Sun Nov 20 17:37:05 2005 +0000 by bestorga-oss $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/hash.h sblim-sfcb-1.4.8/mofc/hash.h --- sblim-sfcb-1.4.6/mofc/hash.h 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/hash.h 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: hash.h,v 1.3 2007/03/20 09:40:54 mihajlov Exp $ + * $Id: hash.h d2da443 on Tue Mar 20 09:40:54 2007 +0000 by mihajlov $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/Makefile.am sblim-sfcb-1.4.8/mofc/Makefile.am --- sblim-sfcb-1.4.6/mofc/Makefile.am 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/Makefile.am 2014-03-26 23:46:36.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.3 2006/01/26 14:01:47 mihajlov Exp $ +# $Id: Makefile.am 4b3e16c on Thu Jan 26 14:01:47 2006 +0000 by mihajlov $ AM_CPPFLAGS=@MOFC_CPPFLAGS@ AM_CFLAGS=@MOFC_CFLAGS@ diff -Nru sblim-sfcb-1.4.6/mofc/Makefile.in sblim-sfcb-1.4.8/mofc/Makefile.in --- sblim-sfcb-1.4.6/mofc/Makefile.in 2013-10-02 15:24:24.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/Makefile.in 2014-03-26 23:56:22.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.3 2006/01/26 14:01:47 mihajlov Exp $ +# $Id: Makefile.am 4b3e16c on Thu Jan 26 14:01:47 2006 +0000 by mihajlov $ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ diff -Nru sblim-sfcb-1.4.6/mofc/mofc.y sblim-sfcb-1.4.8/mofc/mofc.y --- sblim-sfcb-1.4.6/mofc/mofc.y 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/mofc.y 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: mofc.y,v 1.7 2009/01/08 16:46:33 buccella Exp $ + * $Id: mofc.y fd29622 on Thu Jan 8 16:46:33 2009 +0000 by buccella $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/mofdecl.h sblim-sfcb-1.4.8/mofc/mofdecl.h --- sblim-sfcb-1.4.6/mofc/mofdecl.h 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/mofdecl.h 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: mofdecl.h,v 1.3 2009/01/08 16:46:33 buccella Exp $ + * $Id: mofdecl.h fd29622 on Thu Jan 8 16:46:33 2009 +0000 by buccella $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/mofparse.c sblim-sfcb-1.4.8/mofc/mofparse.c --- sblim-sfcb-1.4.6/mofc/mofparse.c 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/mofparse.c 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: mofparse.c,v 1.10 2009/12/22 00:18:29 buccella Exp $ + * $Id: mofparse.c c9508a8 on Tue Dec 22 00:18:29 2009 +0000 by buccella $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/mofs.c sblim-sfcb-1.4.8/mofc/mofs.c --- sblim-sfcb-1.4.6/mofc/mofs.c 2013-10-02 15:25:07.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/mofs.c 2014-03-26 23:57:29.000000000 +0000 @@ -524,7 +524,7 @@ char *yytext; #line 1 "mofs.l" /** - * $Id: mofs.l,v 1.8 2009/01/08 16:46:33 buccella Exp $ + * $Id: mofs.l fd29622 on Thu Jan 8 16:46:33 2009 +0000 by buccella $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/mofs.l sblim-sfcb-1.4.8/mofc/mofs.l --- sblim-sfcb-1.4.6/mofc/mofs.l 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/mofs.l 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: mofs.l,v 1.8 2009/01/08 16:46:33 buccella Exp $ + * $Id: mofs.l fd29622 on Thu Jan 8 16:46:33 2009 +0000 by buccella $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/symtab.c sblim-sfcb-1.4.8/mofc/symtab.c --- sblim-sfcb-1.4.6/mofc/symtab.c 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/symtab.c 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: symtab.c,v 1.13 2009/12/22 00:18:29 buccella Exp $ + * $Id: symtab.c 6b52860 on Wed May 22 15:10:03 2013 -0400 by Michael Chase-Salerno $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofc/symtab.h sblim-sfcb-1.4.8/mofc/symtab.h --- sblim-sfcb-1.4.6/mofc/symtab.h 2013-10-02 15:24:04.000000000 +0000 +++ sblim-sfcb-1.4.8/mofc/symtab.h 2014-03-26 23:46:36.000000000 +0000 @@ -1,5 +1,5 @@ /** - * $Id: symtab.h,v 1.7 2009/01/08 16:46:33 buccella Exp $ + * $Id: symtab.h 034b707 on Fri Aug 10 10:42:27 2012 -0400 by buccella $ * * (C) Copyright IBM Corp. 2004 * diff -Nru sblim-sfcb-1.4.6/mofpp.c sblim-sfcb-1.4.8/mofpp.c --- sblim-sfcb-1.4.6/mofpp.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/mofpp.c 2014-03-26 23:46:30.000000000 +0000 @@ -128,7 +128,10 @@ } } else if (comment == 2) { /* check for block comment */ if ((e = strstr(s, "*/"))) { - strcpy(s, getLineEnding(e)); + if (getLineEnding(e) != NULL) + strcpy(s, getLineEnding(e)); + else + strcpy(s, e + 2); comment = 0; } else { continue; diff -Nru sblim-sfcb-1.4.6/mrwlock.c sblim-sfcb-1.4.8/mrwlock.c --- sblim-sfcb-1.4.6/mrwlock.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/mrwlock.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: mrwlock.c,v 1.2 2005/11/20 17:43:54 bestorga-oss Exp $ + * $Id: mrwlock.c 3558a8a on Thu Feb 25 16:06:54 2010 -0500 by Sean Swehla $ * * (C) Copyright IBM Corp. 2003 * diff -Nru sblim-sfcb-1.4.6/mrwlock.h sblim-sfcb-1.4.8/mrwlock.h --- sblim-sfcb-1.4.6/mrwlock.h 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/mrwlock.h 2014-03-26 23:46:30.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id: mrwlock.h,v 1.2 2005/11/20 17:43:54 bestorga-oss Exp $ + * $Id: mrwlock.h 3558a8a on Thu Feb 25 16:06:54 2010 -0500 by Sean Swehla $ * * (C) Copyright IBM Corp. 2003 * diff -Nru sblim-sfcb-1.4.6/NEWS sblim-sfcb-1.4.8/NEWS --- sblim-sfcb-1.4.6/NEWS 2013-10-02 15:29:41.000000000 +0000 +++ sblim-sfcb-1.4.8/NEWS 2014-03-26 23:53:19.000000000 +0000 @@ -1,3 +1,40 @@ +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 +================ + +New features: +- [sfcb-tix:#86] Support configurable SSL Diffie Hellman parameters file +- [sfcb-tix:#87] Support configurable SSL ECDH elliptic curve name +- [sfcb-tix:#76] Identify running SFCB processes in ps output + +Bugs fixed: +- [sfcb-tix:#81] Bad CMPIType assignment in cimXmlOps +- [sfcb-tix:#82] ClientEnvFT for SfcbLocal doesn't match SFCC +- [sfcb-tix:#83] Add Alternate getObjectPath() for SfcbLocal Connections +- [sfcb-tix:#84] Upcall mutex not freed on shutdown +- [sfcb-tix:#85] SFCB: SfcbLocal interface should expose markHeap() and releaseHeap() +- [sfcb-tix:#88] Ensure unique semaphore keys across multiple http adapters +- [sfcb-tix:#92] indicationDeliveryThreadLimit not properly enforced +- [sfcb-tix:#93] ProfileProvider segfault while stopping slpUpdate thread +- [sfcb-tix:#90] Problems with enableInteroOp=false + Changes in 1.4.6 ================ diff -Nru sblim-sfcb-1.4.6/objectImpl.c sblim-sfcb-1.4.8/objectImpl.c --- sblim-sfcb-1.4.6/objectImpl.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/objectImpl.c 2014-03-26 23:46:30.000000000 +0000 @@ -3064,7 +3064,7 @@ 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 @@ 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 -Nru sblim-sfcb-1.4.6/objectImplSwapI32toP32.c sblim-sfcb-1.4.8/objectImplSwapI32toP32.c --- sblim-sfcb-1.4.6/objectImplSwapI32toP32.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/objectImplSwapI32toP32.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: objectImplSwapI32toP32.c,v 1.17 2008/11/07 17:00:44 mchasal Exp $ + * $Id: objectImplSwapI32toP32.c 70f1735 on Tue Jun 11 17:50:34 2013 -0400 by Michael Chase-Salerno $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/predicate.c sblim-sfcb-1.4.8/predicate.c --- sblim-sfcb-1.4.6/predicate.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/predicate.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: predicate.c,v 1.7 2007/10/02 09:02:11 mihajlov Exp $ + * $Id: predicate.c a18b0bd on Thu Jan 10 15:27:06 2013 -0500 by buccella $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/profileProvider.c sblim-sfcb-1.4.8/profileProvider.c --- sblim-sfcb-1.4.6/profileProvider.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/profileProvider.c 2014-03-26 23:46:30.000000000 +0000 @@ -211,12 +211,14 @@ CMPIStatus st = { CMPI_RC_OK, NULL }; _SFCB_ENTER(TRACE_INDPROVIDER, "ProfileProviderCleanup"); #ifdef HAVE_SLP - // Tell SLP update thread that we're shutting down - _SFCB_TRACE(1, ("--- Stopping SLP thread")); - pthread_kill(slpUpdateThread, SIGUSR2); - // Wait for thread to complete - pthread_join(slpUpdateThread, NULL); - _SFCB_TRACE(1, ("--- SLP Thread stopped")); + if (slpUpdateThread) { + // Tell SLP update thread that we're shutting down + _SFCB_TRACE(1, ("--- Stopping SLP thread")); + pthread_kill(slpUpdateThread, SIGUSR2); + // Wait for thread to complete + pthread_join(slpUpdateThread, NULL); + _SFCB_TRACE(1, ("--- SLP Thread stopped")); + } #endif // HAVE_SLP _SFCB_RETURN(st); } diff -Nru sblim-sfcb-1.4.6/providerDrv.c sblim-sfcb-1.4.8/providerDrv.c --- sblim-sfcb-1.4.6/providerDrv.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/providerDrv.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: providerDrv.c,v 1.83 2010/02/04 19:20:38 smswehla Exp $ + * $Id: providerDrv.c 81089c5 on Sat Jan 11 20:12:00 2014 -0500 by Dave Heller $ * * © Copyright IBM Corp. 2005, 2007 * @@ -165,14 +165,13 @@ unsigned long provTimeoutInterval = 25; unsigned provAutoGroup = 0; static int stopping = 0; +static int handlingError = 0; void uninitProvProcCtl(); extern void uninitSocketPairs(); extern void sunsetControl(); extern void uninitGarbageCollector(); -static BinResponseHdr *err_crash_resp; /* holds generic "we crashed" response */ -static long ecr_len; static long makeSafeResponse(BinResponseHdr *hdr, BinResponseHdr **out); typedef struct parms { @@ -472,28 +471,78 @@ static void -handleSigSegv(int __attribute__ ((unused)) sig) +handleSigError(int sig) { - Parms *threads = activeThreadsFirst; + Parms *threads = activeThreadsFirst; int dmy = -1; + /* prevent value from being optimized out so we can see it in call stack */ + char * volatile signame; - mlogf(M_ERROR, M_SHOW, - "-#- %s - %d provider exiting due to a SIGSEGV signal\n", - processName, currentProc); - while (threads) { - spSendResult(&threads->requestor, &dmy, err_crash_resp, ecr_len); - threads=threads->next; + if (handlingError) + goto end; + else + handlingError = 1; + + switch (sig) { + case (SIGABRT): + signame = "SIGABRT"; + break; + case (SIGSEGV): + signame = "SIGSEGV"; + break; + case (SIGFPE): + signame = "SIGFPE"; + break; + default: + signame = "UNKNOWN"; + break; } - abort(); /* force cord dump */ + + mlogf(M_ERROR, M_SHOW, "-#- %s - %d provider exiting due to a %s signal\n", + processName, currentProc, signame); + + if (threads) { + char msg[1024]; + snprintf(msg, 1023, "*** Provider %s(%d) exiting due to a %s signal", + processName, currentProc, signame); + BinResponseHdr *buf = errorCharsResp(CMPI_RC_ERR_FAILED, msg); + BinResponseHdr *resp; + long rlen = makeSafeResponse(buf, &resp); + + while (threads) { + spSendResult(&threads->requestor, &dmy, resp, rlen); + threads = threads->next; + } + } + abort(); /* force core dump */ + + end:; } static void handleSigUsr1(int __attribute__ ((unused)) sig) { + Parms *threads = activeThreadsFirst; + int dmy = -1; + stopping = 1; + + if (threads) { + char msg[1024]; + snprintf(msg, 1023, "*** Provider %s(%d) exiting due to a shutdown request", + processName, currentProc); + BinResponseHdr *buf = errorCharsResp(CMPI_RC_ERR_FAILED, msg); + BinResponseHdr *resp; + long rlen = makeSafeResponse(buf, &resp); + + while (threads) { + spSendResult(&threads->requestor, &dmy, resp, rlen); + threads = threads->next; + } + } + pthread_t t; pthread_attr_t tattr; - stopping = 1; pthread_attr_init(&tattr); pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED); pthread_create(&t, &tattr, (void *(*)(void *)) stopProc, NULL); @@ -894,7 +943,22 @@ setSignal(SIGUSR1, handleSigUsr1, 0); setSignal(SIGUSR2, SIG_IGN,0); - setSignal(SIGSEGV, handleSigSegv, SA_ONESHOT); + setSignal(SIGSEGV, handleSigError, SA_ONESHOT); + setSignal(SIGABRT, handleSigError, SA_ONESHOT); + setSignal(SIGFPE, handleSigError, SA_ONESHOT); + + /* Label the process by modifying the cmdline */ + extern void append2Argv(char *appendstr); + extern unsigned int labelProcs; + if (labelProcs) { + append2Argv(NULL); + append2Argv("-proc:"); + append2Argv(info->providerName);; + append2Argv(" -class:"); + append2Argv(info->className); + append2Argv(" -location:"); + append2Argv(info->location); + } // If requested, change the uid of the provider if (info->uid != -1) { @@ -957,14 +1021,6 @@ _SFCB_ABORT(); } - char msg[1024]; - snprintf(msg,1023, "*** Provider %s(%d) exiting due to a SIGSEGV signal", - processName, currentProc); - BinResponseHdr* buf = errorCharsResp(CMPI_RC_ERR_FAILED, msg); - - ecr_len = makeSafeResponse(buf, &err_crash_resp); - free(buf); - processProviderInvocationRequests(info->providerName); _SFCB_RETURN(0); } diff -Nru sblim-sfcb-1.4.6/providerMgr.c sblim-sfcb-1.4.8/providerMgr.c --- sblim-sfcb-1.4.6/providerMgr.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/providerMgr.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: providerMgr.c,v 1.70 2010/01/29 00:21:40 buccella Exp $ + * $Id: providerMgr.c 405966f on Sat Dec 28 12:28:30 2013 -0500 by Dave Heller $ * * © Copyright IBM Corp. 2005, 2007 * @@ -198,6 +198,15 @@ ProviderInfo *info; UtilHashTable **ht = provHt(type, 0); + /* enforce enableInterOp = false [sfcb#90] */ + if (!(exFlags & 2)) { + if (strcasecmp(nameSpace, "root/interop") == 0) { + st->msg = sfcb_native_new_CMPIString("Interop namespace disabled",NULL,0); + st->rc = CMPI_RC_ERR_INVALID_NAMESPACE; + _SFCB_RETURN(NULL); + } + } + if (*ht == NULL) { *ht = UtilFactory->newHashTable(61, UtilHashTable_charKey | @@ -1007,27 +1016,41 @@ sigfillset(&mask); sigprocmask(SIG_SETMASK, &mask, &old_mask); - rc=startUpProvider("root/interop", "$ClassProvider$",0); - if (rc != 0 ) { - mlogf(M_ERROR,M_SHOW,"--- ClassProvider failed to start, rc:%d\n",rc); - sigprocmask(SIG_SETMASK, &old_mask, NULL); - _SFCB_RETURN(); - } - - /* wait until classProvider is finished init'ing */ - semAcquire(sfcbSem,INIT_CLASS_PROV_ID); + /* enforce enableInterOp = false [sfcb#90] */ + if (exFlags & 2) { + rc=startUpProvider("root/interop", "$ClassProvider$",0); + if (rc != 0 ) { + mlogf(M_ERROR,M_SHOW,"--- ClassProvider failed to start, rc:%d\n",rc); + sigprocmask(SIG_SETMASK, &old_mask, NULL); + _SFCB_RETURN(); + } + + /* wait until classProvider is finished init'ing */ + semAcquire(sfcbSem,INIT_CLASS_PROV_ID); + } + else { + interOpProvInfoPtr = forceNoProvInfoPtr; + } #ifdef SFCB_INCL_INDICATION_SUPPORT - if (interOpProvInfoPtr != forceNoProvInfoPtr) { + if (exFlags & 2) { startUpProvider("root/interop", "$InterOpProvider$",1); /* note: we don't wait here for interopProvider to finish init'ing, because its init has some reqs that providerMgr will need to process. httpAdapter waits for interop to init before accepting HTTP requests */ + } else { + mlogf(M_INFO, M_SHOW, + "--- No indication support because InterOp namespace disabled\n"); } #endif #ifdef HAVE_SLP - startUpProvider("root/interop", "$ProfileProvider$",1); + if (exFlags & 2) { + startUpProvider("root/interop", "$ProfileProvider$",1); + } else { + mlogf(M_INFO, M_SHOW, + "--- No SLP support because InterOp namespace disabled\n"); + } #endif sigprocmask(SIG_SETMASK, &old_mask, NULL); diff -Nru sblim-sfcb-1.4.6/providerRegister.c sblim-sfcb-1.4.8/providerRegister.c --- sblim-sfcb-1.4.6/providerRegister.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/providerRegister.c 2014-03-26 23:46:30.000000000 +0000 @@ -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 @@ 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) diff -Nru sblim-sfcb-1.4.6/qualifier.c sblim-sfcb-1.4.8/qualifier.c --- sblim-sfcb-1.4.6/qualifier.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/qualifier.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: qualifier.c,v 1.5 2007/10/02 09:02:11 mihajlov Exp $ + * $Id: qualifier.c 70f1735 on Tue Jun 11 17:50:34 2013 -0400 by Michael Chase-Salerno $ * * (C) Copyright IBM Corp. 2006 * diff -Nru sblim-sfcb-1.4.6/qualifier.h sblim-sfcb-1.4.8/qualifier.h --- sblim-sfcb-1.4.6/qualifier.h 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/qualifier.h 2014-03-26 23:46:30.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: qualifier.h,v 1.1 2006/09/28 11:46:10 sschuetz Exp $ + * $Id: qualifier.h 54a4b08 on Tue Jun 22 18:27:14 2010 -0400 by Michael Chase-Salerno $ * * (C) Copyright IBM Corp. 2006 * diff -Nru sblim-sfcb-1.4.6/qualifierProvider.c sblim-sfcb-1.4.8/qualifierProvider.c --- sblim-sfcb-1.4.6/qualifierProvider.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/qualifierProvider.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: qualifierProvider.c,v 1.8 2008/06/11 20:44:32 buccella Exp $ + * $Id: qualifierProvider.c 2a27df1 on Mon Nov 26 18:26:38 2012 -0500 by buccella $ * * (C) Copyright IBM Corp. 2006 * diff -Nru sblim-sfcb-1.4.6/queryLexer.c sblim-sfcb-1.4.8/queryLexer.c --- sblim-sfcb-1.4.6/queryLexer.c 2013-10-02 15:24:53.000000000 +0000 +++ sblim-sfcb-1.4.8/queryLexer.c 2014-03-26 23:56:52.000000000 +0000 @@ -557,7 +557,7 @@ /////////////////////////////////////////////////////////////////////////////// -extern int queryInput(char* buffer, int* numRead, int numRequested); +extern int queryInput(char* buffer, void* numRead, int numRequested); extern int sfcQueryErr(const char*); extern char * sfcQueryStrcpy(char *txt, int len); diff -Nru sblim-sfcb-1.4.6/queryLexer.l sblim-sfcb-1.4.8/queryLexer.l --- sblim-sfcb-1.4.6/queryLexer.l 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/queryLexer.l 2014-03-26 23:46:30.000000000 +0000 @@ -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 -Nru sblim-sfcb-1.4.6/queryOperation.c sblim-sfcb-1.4.8/queryOperation.c --- sblim-sfcb-1.4.6/queryOperation.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/queryOperation.c 2014-03-26 23:46:30.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: queryOperation.c,v 1.15 2009/03/19 23:31:49 mchasal Exp $ + * $Id: queryOperation.c 70f1735 on Tue Jun 11 17:50:34 2013 -0400 by Michael Chase-Salerno $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/queryParser.c sblim-sfcb-1.4.8/queryParser.c --- sblim-sfcb-1.4.6/queryParser.c 2013-10-02 15:24:53.000000000 +0000 +++ sblim-sfcb-1.4.8/queryParser.c 2014-03-26 23:56:51.000000000 +0000 @@ -78,7 +78,7 @@ /* - * $Id: queryParser.y,v 1.14 2009/04/03 21:38:34 mchasal Exp $ + * $Id: queryParser.y 7d50a4b on Thu Jan 10 14:21:49 2013 -0500 by buccella $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/queryParser.y sblim-sfcb-1.4.8/queryParser.y --- sblim-sfcb-1.4.6/queryParser.y 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/queryParser.y 2014-03-26 23:46:31.000000000 +0000 @@ -10,7 +10,7 @@ %{ /* - * $Id: queryParser.y,v 1.14 2009/04/03 21:38:34 mchasal Exp $ + * $Id: queryParser.y 7d50a4b on Thu Jan 10 14:21:49 2013 -0500 by buccella $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/queryStatement.c sblim-sfcb-1.4.8/queryStatement.c --- sblim-sfcb-1.4.6/queryStatement.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/queryStatement.c 2014-03-26 23:46:31.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: queryStatement.c,v 1.14 2007/06/22 10:34:43 sschuetz Exp $ + * $Id: queryStatement.c 70f1735 on Tue Jun 11 17:50:34 2013 -0400 by Michael Chase-Salerno $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/selectexp.c sblim-sfcb-1.4.8/selectexp.c --- sblim-sfcb-1.4.6/selectexp.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/selectexp.c 2014-03-26 23:46:31.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: selectexp.c,v 1.11 2007/10/02 09:02:11 mihajlov Exp $ + * $Id: selectexp.c 70f1735 on Tue Jun 11 17:50:34 2013 -0400 by Michael Chase-Salerno $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/sfcBasicPAMAuthentication.c sblim-sfcb-1.4.8/sfcBasicPAMAuthentication.c --- sblim-sfcb-1.4.6/sfcBasicPAMAuthentication.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcBasicPAMAuthentication.c 2014-03-26 23:46:31.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: sfcBasicPAMAuthentication.c,v 1.1 2007/02/15 14:07:22 mihajlov Exp $ + * $Id: sfcBasicPAMAuthentication.c eba660d on Thu Aug 30 01:59:20 2012 -0400 by Michael Chase-Salerno $ * * © Copyright IBM Corp. 2007 * diff -Nru sblim-sfcb-1.4.6/sfcb.cfg.pre.in sblim-sfcb-1.4.8/sfcb.cfg.pre.in --- sblim-sfcb-1.4.6/sfcb.cfg.pre.in 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcb.cfg.pre.in 2014-03-26 23:46:31.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: sfcb.cfg.pre.in,v 1.20 2009/12/04 21:41:00 buccella Exp $ +# $Id: sfcb.cfg.pre.in 0b313d3 on Sat Mar 22 11:32:35 2014 -0400 by Dave Heller $ ## ## Sample Configuration for Small Footprint CIM Broker ## @@ -144,6 +144,11 @@ ## 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. @@ -271,6 +276,32 @@ ## weak ciphers. sslCiphers: ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH +## Optionally configure a DH parameters file for ephemeral key generation. +## See man SSL_CTX_set_tmp_dh_callback(3) for details. The value should be +## the full path to the file. Note that ephemeral key generation will still +## proceed, where applicable, without this file; it is only required when the +## user desires a key length greater than the (openssl) default. If this +## value is not set, no DH parameters file is configured. If the value is set +## but the file is unreadable or contains bad data, and https is configured, +## SFCB will abort. The data is expected to be in PEM format. +## Default is: not set +#sslDhParamsFilePath: @sysconfdir@/sfcb/dh_param_file.pem + +## Configure a curve name for ECDH ephemeral key generation. See man +## SSL_CTX_set_tmp_ecdh(3) for details. The value should be a curve name +## listed by the "openssl ecparam -list_curves" command in the SFCB runtime +## environment. If this value is not set, the indicated default is in effect. +## If the value is set but the curve name is not recognized by the underlying +## openssl implementation, SFCB will abort. +## 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 @@ -335,6 +366,31 @@ ## 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 + +## 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 diff -Nru sblim-sfcb-1.4.6/sfcbdump.c sblim-sfcb-1.4.8/sfcbdump.c --- sblim-sfcb-1.4.6/sfcbdump.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcbdump.c 2014-03-26 23:46:32.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: sfcbdump.c,v 1.6 2009/12/22 00:18:29 buccella Exp $ + * $Id: sfcbdump.c c89835c on Tue Jan 15 16:20:24 2013 -0500 by buccella $ * * (C) Copyright IBM Corp. 2006 * diff -Nru sblim-sfcb-1.4.6/sfcbdumpP32onI32.c sblim-sfcb-1.4.8/sfcbdumpP32onI32.c --- sblim-sfcb-1.4.6/sfcbdumpP32onI32.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcbdumpP32onI32.c 2014-03-26 23:46:32.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: sfcbdumpP32onI32.c,v 1.9 2008/12/18 21:34:33 mchasal Exp $ + * $Id: sfcbdumpP32onI32.c c89835c on Tue Jan 15 16:20:24 2013 -0500 by buccella $ * * (C) Copyright IBM Corp. 2006 * diff -Nru sblim-sfcb-1.4.6/sfcb.init-none.in sblim-sfcb-1.4.8/sfcb.init-none.in --- sblim-sfcb-1.4.6/sfcb.init-none.in 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcb.init-none.in 2014-03-26 23:46:31.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: sfcb.init-none.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $ +# $Id: sfcb.init-none.in db944f0 on Mon Apr 29 17:57:12 2013 -0400 by Michael Chase-Salerno $ # # Generic System V Init Script diff -Nru sblim-sfcb-1.4.6/sfcb.init-redhat.in sblim-sfcb-1.4.8/sfcb.init-redhat.in --- sblim-sfcb-1.4.6/sfcb.init-redhat.in 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcb.init-redhat.in 2014-03-26 23:46:31.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: sfcb.init-redhat.in,v 1.2 2005/06/13 12:50:33 mihajlov Exp $ +# $Id: sfcb.init-redhat.in d10ba60 on Sun Jul 29 17:38:39 2012 -0400 by Dave Heller $ # # chkconfig: 35 20 80 # diff -Nru sblim-sfcb-1.4.6/sfcb.init-suse.in sblim-sfcb-1.4.8/sfcb.init-suse.in --- sblim-sfcb-1.4.6/sfcb.init-suse.in 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcb.init-suse.in 2014-03-26 23:46:31.000000000 +0000 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Id: sfcb.init-suse.in,v 1.3 2005/07/28 08:09:38 mihajlov Exp $ +# $Id: sfcb.init-suse.in d10ba60 on Sun Jul 29 17:38:39 2012 -0400 by Dave Heller $ # ### BEGIN INIT INFO # Provides: sfcb diff -Nru sblim-sfcb-1.4.6/sfcbproc.c sblim-sfcb-1.4.8/sfcbproc.c --- sblim-sfcb-1.4.6/sfcbproc.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcbproc.c 2014-03-26 23:46:32.000000000 +0000 @@ -1,5 +1,5 @@ /* - * $Id$ + * $Id: sfcbproc.c c29c15e on Wed Feb 19 18:47:31 2014 -0500 by Dave Heller $ * * (C) Copyright IBM Corp. 2013 * @@ -23,7 +23,7 @@ #define ERROR -1 #define BUFFER_SZ 32 -#define MAX_CMD_SZ 64 +#define MAX_CMD_SZ 256 #define MAX_PATH_SZ 64 #define MAX_PATTERN_SZ 32 #define MAX_PORTS 6 @@ -336,8 +336,21 @@ } int pass = 0; *p->cmd = '\0'; + /* + * Note getdelim() will normally return 0 if there is no data to be read + * other than a delim char. But when the delim char is NULL, getdelim() + * will always return at least one. Therefore, read=1 => no more data. + */ while ((read = getdelim(&line, &len, 0, fp)) != -1) { - if (strlen(p->cmd) + strlen(line) > MAX_CMD_SZ-2) { + if ((read <= 1) || strlen(p->cmd) + (read-1) > MAX_CMD_SZ-2) { + /* + * Breaking when no data has been read is akin to breaking on the first + * occurrence of a double-null. The intent is to clean up --raw output + * by discarding the trailing nulls in argv when labelProcs is in effect + * [sfcb-tix:#76]. If for some strange reason there is an occurrence of + * a double-null somewhere in argv and there is additional data beyond + * that, this would hide the additional data. + */ break; } else { @@ -509,7 +522,7 @@ 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 -Nru sblim-sfcb-1.4.6/sfcBroker.c sblim-sfcb-1.4.8/sfcBroker.c --- sblim-sfcb-1.4.6/sfcBroker.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcBroker.c 2014-03-26 23:46:31.000000000 +0000 @@ -62,7 +62,7 @@ extern CMPIBroker *Broker; extern void initProvProcCtl(int); extern void processTerminated(int pid); -extern int httpDaemon(int argc, char *argv[], int sslMode, char *ipAddr, sa_family_t ipAddrFam); +extern int httpDaemon(int argc, char *argv[], int sslMode, int adapterNum, char *ipAddr, sa_family_t ipAddrFam); extern void processProviderMgrRequests(); extern int stopNextProc(); @@ -104,6 +104,12 @@ extern char *ip4List; extern char *ip6List; +extern char **origArgv; +extern int origArgc; +extern unsigned int labelProcs; +extern void append2Argv(char *appendstr); +extern void restoreOrigArgv(int removePad); + #ifdef HAVE_IPV6 int fallback_ipv4 = 1; #endif @@ -187,6 +193,9 @@ static int stopping = 0; extern int remSem(); +/* secs to wait for a process to die during shutdown [sfcb#94] */ +static int sigChldWaitTime = 3; + static void stopBroker(void *p) { @@ -226,7 +235,7 @@ if (adaptersStopped == 0) { pthread_mutex_lock(&sdMtx); - waitTime.tv_sec = time(NULL) + 1; //5 + waitTime.tv_sec = time(NULL) + sigChldWaitTime; waitTime.tv_nsec = 0; if (sa == 0) fprintf(stderr, "--- Stopping adapters\n"); @@ -245,7 +254,7 @@ if (adaptersStopped) { pthread_mutex_lock(&sdMtx); - waitTime.tv_sec = time(NULL) + 1; //5 + waitTime.tv_sec = time(NULL) + sigChldWaitTime; waitTime.tv_nsec = 0; if (sp == 0) fprintf(stderr, "--- Stopping providers\n"); @@ -272,7 +281,7 @@ closeLogging(1); free((void *)sfcBrokerStart); - pthread_mutex_unlock(&syncMtx); +// pthread_mutex_unlock(&syncMtx); /* [sfcb#95] */ unloadHostnameLib(); @@ -338,6 +347,8 @@ if (sfcBrokerPid == currentProc) { restartBroker = 1; + if (labelProcs) + restoreOrigArgv(1); fprintf(stderr, "--- Restarting %s\n", processName); pthread_attr_init(&tattr); pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED); @@ -397,7 +408,17 @@ static int reStartHttpd(void) { - return startHttpd(restartArgc, restartArgv, sslMode); + /* Restore orig argv or startup banner will be hosed on httpd restart */ + if (labelProcs) + restoreOrigArgv(0); + + int rc = startHttpd(restartArgc, restartArgv, sslMode); + + /* Relabel the process */ + if (labelProcs) + append2Argv(NULL); + + return rc; } static void @@ -418,7 +439,7 @@ } while(!adaptersStopped) { pthread_mutex_lock(&sdMtx); - waitTime.tv_sec=time(NULL)+1; //5 + waitTime.tv_sec=time(NULL) + sigChldWaitTime; waitTime.tv_nsec=0; if (sa==0) fprintf(stderr,"--- Stopping http adapters\n"); sa++; @@ -514,10 +535,10 @@ exit(2); } } - if (httpDaemon(argc, argv, sslMode, (ipAddrList + i)->addrStr, + if (httpDaemon(argc, argv, sslMode, i+1, (ipAddrList + i)->addrStr, (ipAddrList + i)->addrFam)) { //kill(sfcPid, 3); /* if port in use, shutdown */ - /* (don't do this anymore - xxxxxxx) */ + /* (don't do this anymore - 3597806) */ } closeSocket(&sfcbSockets,cRcv,"startHttpd"); closeSocket(&resultSockets,cAll,"startHttpd"); @@ -637,6 +658,10 @@ char *pauseStr; int daemonize=0; + /* Note we will see no mlogf() output prior to this flag being set. If the + * flag is set but startLogging() has not yet been called, mlogf() will write + * to syslog directly. After startLogging(), mlogf() will write through the + * the logging facility. */ sfcbUseSyslog=1; name = strrchr(argv[0], '/'); @@ -651,8 +676,8 @@ provPauseStr = getenv("SFCB_PAUSE_PROVIDER"); httpPauseStr = getenv("SFCB_PAUSE_CODEC"); currentProc = sfcBrokerPid = getpid(); - restartArgc = argc; - restartArgv = argv; + restartArgc = origArgc = argc; + restartArgv = origArgv = argv; exFlags = 0; @@ -748,7 +773,7 @@ } } - if (optind < argc) { + if (optind < argc && *argv[optind] != 'X') { /* Ignore the pad argument */ fprintf(stderr, "SFCB not started: unrecognized config property %s\n", argv[optind]); usage(1); @@ -766,6 +791,41 @@ currentProc=sfcBrokerPid=getpid(); /* req. on some systems */ } + char *envLabelProcs = getenv("SFCB_LABELPROCS"); + if (envLabelProcs && *envLabelProcs) { + char *endptr; + long val = strtol(envLabelProcs, &endptr, 10); + if ((*endptr =='\0') && (val > 0) && (val < 1024)) + labelProcs = (unsigned int) val; + } + + if (labelProcs) { + if (*argv[argc-1] != 'X') { + /* Create an expanded argv */ + char **newArgv = malloc(sizeof(char*) * (argc + 2)); + memcpy(newArgv, argv, sizeof(char*) * argc); + + /* Create a pad argument of appropriate length */ + char *padArg = malloc(labelProcs + 1); + for (i=0; i < (int)labelProcs; i++) + padArg[i] = 'X'; + padArg[i] = '\0'; + + /* Add pad argument and null terminator */ + newArgv[argc] = padArg; + newArgv[argc + 1] = NULL; + + /* Restart with expanded argv */ + fprintf(stderr, + "--- %s V" sfcHttpDaemonVersion " performing labelProcs allocation - %d\n", + name, currentProc); + execvp(newArgv[0], newArgv); + fprintf(stderr, "--- failed to execv for labelProcs allocation: %s\n", + strerror(errno)); + exit(1); + } + } + startLogging(syslogLevel,1); mlogf(M_NOTICE, M_SHOW, "--- %s V" sfcHttpDaemonVersion " started - %d\n", @@ -897,6 +957,15 @@ 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; } @@ -1006,6 +1075,11 @@ setSignal(SIGCHLD, handleSigChld, 0); setSignal(SIGUSR2, handleSigUsr2, 0); + /* Label the process by modifying the cmdline */ + if (labelProcs) { + append2Argv("-proc:Main"); + } + processProviderMgrRequests(); stopBroker(NULL); diff -Nru sblim-sfcb-1.4.6/sfcbsem.c sblim-sfcb-1.4.8/sfcbsem.c --- sblim-sfcb-1.4.6/sfcbsem.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcbsem.c 2014-03-26 23:46:32.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: sfcbsem.c,v 1.1 2012/02/24 22:49:40 buccella Exp $ + * $Id: sfcbsem.c e8dc4e6 on Tue Feb 28 19:32:42 2012 -0500 by buccella $ * * (C) Copyright IBM Corp. 2006 * diff -Nru sblim-sfcb-1.4.6/sfcb.spec sblim-sfcb-1.4.8/sfcb.spec --- sblim-sfcb-1.4.6/sfcb.spec 2013-10-02 15:31:39.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcb.spec 2014-03-26 23:56:43.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: sfcb.spec.in,v 1.16 2007/03/16 13:54:44 mihajlov Exp $ +# $Id: sfcb.spec.in 10ae1a7 on Tue Jun 4 11:09:40 2013 -0400 by Dave Heller $ # # Package spec for sblim-sfcb # @@ -8,7 +8,7 @@ Summary: Small Footprint CIM Broker Name: sblim-sfcb -Version: 1.4.6 +Version: 1.4.8 Release: 0 Group: Systems Management/Base License: EPL diff -Nru sblim-sfcb-1.4.6/sfcb.spec.in sblim-sfcb-1.4.8/sfcb.spec.in --- sblim-sfcb-1.4.6/sfcb.spec.in 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcb.spec.in 2014-03-26 23:46:32.000000000 +0000 @@ -1,5 +1,5 @@ # -# $Id: sfcb.spec.in,v 1.16 2007/03/16 13:54:44 mihajlov Exp $ +# $Id: sfcb.spec.in 10ae1a7 on Tue Jun 4 11:09:40 2013 -0400 by Dave Heller $ # # Package spec for @PACKAGE@ # diff -Nru sblim-sfcb-1.4.6/sfcbtrace.c sblim-sfcb-1.4.8/sfcbtrace.c --- sblim-sfcb-1.4.6/sfcbtrace.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/sfcbtrace.c 2014-03-26 23:46:32.000000000 +0000 @@ -85,7 +85,7 @@ 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 -Nru sblim-sfcb-1.4.6/subcond.c sblim-sfcb-1.4.8/subcond.c --- sblim-sfcb-1.4.6/subcond.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/subcond.c 2014-03-26 23:46:32.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: subcond.c,v 1.4 2007/03/05 18:12:14 mihajlov Exp $ + * $Id: subcond.c 3558a8a on Thu Feb 25 16:06:54 2010 -0500 by Sean Swehla $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/support.c sblim-sfcb-1.4.8/support.c --- sblim-sfcb-1.4.6/support.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/support.c 2014-03-26 23:46:32.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: support.c,v 1.36 2009/12/22 00:18:29 buccella Exp $ + * $Id: support.c ab857f6 on Tue Sep 24 17:12:16 2013 -0400 by Dave Heller $ * * © Copyright IBM Corp. 2005, 2007 * diff -Nru sblim-sfcb-1.4.6/support.h sblim-sfcb-1.4.8/support.h --- sblim-sfcb-1.4.6/support.h 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/support.h 2014-03-26 23:46:32.000000000 +0000 @@ -1,6 +1,6 @@ /* - * $Id: support.h,v 1.16 2009/03/10 19:18:19 buccella Exp $ + * $Id: support.h 55887c1 on Wed Apr 17 22:44:26 2013 -0400 by Michael Chase-Salerno $ * * support.h * diff -Nru sblim-sfcb-1.4.6/test/cimrstest/Makefile.am sblim-sfcb-1.4.8/test/cimrstest/Makefile.am --- sblim-sfcb-1.4.6/test/cimrstest/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/cimrstest/Makefile.am 2014-03-26 23:46:33.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 3e8f7d6 on Tue Jul 20 18:56:56 2010 -0400 by buccella $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/cimrstest/Makefile.in sblim-sfcb-1.4.8/test/cimrstest/Makefile.in --- sblim-sfcb-1.4.6/test/cimrstest/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/cimrstest/Makefile.in 2014-03-26 23:56:13.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 3e8f7d6 on Tue Jul 20 18:56:56 2010 -0400 by buccella $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/commands/Makefile.am sblim-sfcb-1.4.8/test/commands/Makefile.am --- sblim-sfcb-1.4.6/test/commands/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/commands/Makefile.am 2014-03-26 23:46:33.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am d289e95 on Thu Jun 13 13:26:04 2013 -0400 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/commands/Makefile.in sblim-sfcb-1.4.8/test/commands/Makefile.in --- sblim-sfcb-1.4.6/test/commands/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/commands/Makefile.in 2014-03-26 23:56:13.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am d289e95 on Thu Jun 13 13:26:04 2013 -0400 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/finaltest/Makefile.am sblim-sfcb-1.4.8/test/finaltest/Makefile.am --- sblim-sfcb-1.4.6/test/finaltest/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/finaltest/Makefile.am 2014-03-26 23:46:33.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 8d59a3b on Mon Apr 29 19:29:39 2013 -0400 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/finaltest/Makefile.in sblim-sfcb-1.4.8/test/finaltest/Makefile.in --- sblim-sfcb-1.4.6/test/finaltest/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/finaltest/Makefile.in 2014-03-26 23:56:13.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 8d59a3b on Mon Apr 29 19:29:39 2013 -0400 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/Makefile sblim-sfcb-1.4.8/test/Makefile --- sblim-sfcb-1.4.6/test/Makefile 2013-10-02 15:31:40.000000000 +0000 +++ sblim-sfcb-1.4.8/test/Makefile 2014-03-26 23:56:43.000000000 +0000 @@ -15,7 +15,7 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 640d608 on Wed Feb 29 15:32:15 2012 -0500 by buccella $ # # Makefile.am # @@ -180,10 +180,10 @@ PACKAGE = sblim-sfcb PACKAGE_BUGREPORT = sblim-devel@lists.sourceforge.net PACKAGE_NAME = Small Footprint CIM Broker -PACKAGE_STRING = Small Footprint CIM Broker 1.4.6 +PACKAGE_STRING = Small Footprint CIM Broker 1.4.8 PACKAGE_TARNAME = sblim-sfcb PACKAGE_URL = -PACKAGE_VERSION = 1.4.6 +PACKAGE_VERSION = 1.4.8 PATH_SEPARATOR = : PROFILER = RANLIB = ranlib @@ -204,7 +204,7 @@ STRIP = strip SYSTEMDDIR = /share/systemd TEST_SUBDIRS = -VERSION = 1.4.6 +VERSION = 1.4.8 YACC = bison -y abs_builddir = /root/sblim/sfcb/test abs_srcdir = /root/sblim/sfcb/test diff -Nru sblim-sfcb-1.4.6/test/Makefile.am sblim-sfcb-1.4.8/test/Makefile.am --- sblim-sfcb-1.4.6/test/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/Makefile.am 2014-03-26 23:46:32.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 640d608 on Wed Feb 29 15:32:15 2012 -0500 by buccella $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/Makefile.in sblim-sfcb-1.4.8/test/Makefile.in --- sblim-sfcb-1.4.6/test/Makefile.in 2013-10-02 15:31:18.000000000 +0000 +++ sblim-sfcb-1.4.8/test/Makefile.in 2014-03-26 23:56:13.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 640d608 on Wed Feb 29 15:32:15 2012 -0500 by buccella $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/schema/root/cimv2/Test_Method.mof sblim-sfcb-1.4.8/test/schema/root/cimv2/Test_Method.mof --- sblim-sfcb-1.4.6/test/schema/root/cimv2/Test_Method.mof 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/schema/root/cimv2/Test_Method.mof 2014-03-26 23:46:34.000000000 +0000 @@ -2,4 +2,5 @@ { string SayHello( [IN] string Name, [OUT] string Message); string CheckArrayNoType( [IN] uint32 IntArray[], [OUT] string Message); + string Misbehave( [IN] string Action, [OUT] string Message); }; diff -Nru sblim-sfcb-1.4.6/test/slptest/Makefile.am sblim-sfcb-1.4.8/test/slptest/Makefile.am --- sblim-sfcb-1.4.6/test/slptest/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/slptest/Makefile.am 2014-03-26 23:46:34.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am a931aee on Thu Mar 4 17:34:55 2010 -0500 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/slptest/Makefile.in sblim-sfcb-1.4.8/test/slptest/Makefile.in --- sblim-sfcb-1.4.6/test/slptest/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/slptest/Makefile.in 2014-03-26 23:56:14.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am a931aee on Thu Mar 4 17:34:55 2010 -0500 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/TestProviders/cmpiTestMethodProvider.c sblim-sfcb-1.4.8/test/TestProviders/cmpiTestMethodProvider.c --- sblim-sfcb-1.4.6/test/TestProviders/cmpiTestMethodProvider.c 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/TestProviders/cmpiTestMethodProvider.c 2014-03-26 23:46:33.000000000 +0000 @@ -1,5 +1,6 @@ #include #include +#include #include "cmpi/cmpidt.h" #include "cmpi/cmpift.h" #include "cmpi/cmpimacs.h" @@ -121,12 +122,87 @@ * Adds a value of str2 string to out array argument */ rc = CMAddArg(out, argName, &val2, CMPI_string); + + /* + * For: 3048960 method array types not filled in Test provider. + */ } else if (!strcmp("CheckArrayNoType", methodName)) { data = CMGetArg(in, "IntArray", &rc); CMPIType atype=data.value.array->ft->getSimpleType(data.value.array,&rc); sprintf(result,"Datatype is %s",paramType(atype)); str1 = CMNewString(_broker, result, &rc); val1.string = str1; + + /* + * This method simulates various provider problems for testing. + */ + } else if (!strcmp("Misbehave", methodName)) { + data = CMGetArg(in, "Action", &rc); + + const char *strval = NULL; + if (data.type == CMPI_string && !(CMIsNullValue(data))) { + strval = CMGetCharsPtr(data.value.string, &rc); + sprintf(result, "data type is %s, value = %s", paramType(data.type), + strval); + + if (!strcmp(strval,"hang")) { + while(sleep(60)); /* to test req handler timeout, etc. */ + } + else if (!strcmp(strval,"abort")) { + abort(); + } + else if (!strcmp(strval,"fpe")) { + #pragma GCC diagnostic ignored "-Wdiv-by-zero" + fprintf(stderr,"ouch! %d\n",1/0); + #pragma GCC diagnostic warning "-Wdiv-by-zero" + } + else if (!strcmp(strval,"segfault")) { + void (*crashme)(void) = NULL; + crashme(); + } + /* + * These tend to behave as if the condition were raised internally + */ + else if (!strcmp(strval,"sigabrt")) { + kill(getpid(), SIGABRT); + while(sleep(3)); /* slight pause to ensure we catch signal */ + } + else if (!strcmp(strval,"sigfpe")) { + kill(getpid(), SIGFPE); + while(sleep(3)); + } + else if (!strcmp(strval,"sigsegv")) { + kill(getpid(), SIGSEGV); + while(sleep(3)); + } + else if (!strcmp(strval,"sigusr1")) { + kill(getpid(), SIGUSR1); /* as if we received a signal from stopBroker() */ + while(sleep(3)); + } + else if (!strcmp(strval,"sigkill")) { + kill(getpid(), SIGKILL); /* this is currently not handled by providerDrv*/ + while(sleep(3)); + } else { + sprintf(result, "Action not recognized: %s", strval); + fprintf(stderr, + "+++ cmpiTestMethodProvider: Action not recognized \"%s\"\n", + strval); + } + /* + * create the new string to return to client + */ + str1 = CMNewString(_broker, result, &rc); + val1.string = str1; + } + + } else { + sprintf(result, "Unknown method name: %s", methodName); + fprintf(stderr, + "+++ cmpiTestMethodProvider: Unknown method name \"%s\"\n", + methodName); + + str1 = CMNewString(_broker, result, &rc); + val1.string = str1; } } CMReturnData(rslt, (CMPIValue *) & val1, CMPI_string); diff -Nru sblim-sfcb-1.4.6/test/TestProviders/Makefile.am sblim-sfcb-1.4.8/test/TestProviders/Makefile.am --- sblim-sfcb-1.4.6/test/TestProviders/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/TestProviders/Makefile.am 2014-03-26 23:46:32.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am fe37e23 on Wed Apr 10 18:06:17 2013 -0400 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/TestProviders/Makefile.in sblim-sfcb-1.4.8/test/TestProviders/Makefile.in --- sblim-sfcb-1.4.6/test/TestProviders/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/TestProviders/Makefile.in 2014-03-26 23:56:13.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am fe37e23 on Wed Apr 10 18:06:17 2013 -0400 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/TestProviders/tests/Makefile.am sblim-sfcb-1.4.8/test/TestProviders/tests/Makefile.am --- sblim-sfcb-1.4.6/test/TestProviders/tests/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/TestProviders/tests/Makefile.am 2014-03-26 23:46:33.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am c29c15e on Wed Feb 19 18:47:31 2014 -0500 by Dave Heller $ # # Makefile.am # @@ -32,4 +32,4 @@ #Some wbemcat tests export SRCDIR=$(srcdir) -TESTS = $(srcdir)/xmltest.sh $(srcdir)/IndRetryTest.sh $(srcdir)/limitTest.sh +TESTS = xmltest.sh IndRetryTest.sh limitTest.sh diff -Nru sblim-sfcb-1.4.6/test/TestProviders/tests/Makefile.in sblim-sfcb-1.4.8/test/TestProviders/tests/Makefile.in --- sblim-sfcb-1.4.6/test/TestProviders/tests/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/TestProviders/tests/Makefile.in 2014-03-26 23:56:13.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am c29c15e on Wed Feb 19 18:47:31 2014 -0500 by Dave Heller $ # # Makefile.am # @@ -220,7 +220,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ MAINTAINERCLEANFILES = Makefile.in -TESTS = $(srcdir)/xmltest.sh $(srcdir)/IndRetryTest.sh $(srcdir)/limitTest.sh +TESTS = xmltest.sh IndRetryTest.sh limitTest.sh all: all-am .SUFFIXES: diff -Nru sblim-sfcb-1.4.6/test/unittest/Makefile.am sblim-sfcb-1.4.8/test/unittest/Makefile.am --- sblim-sfcb-1.4.6/test/unittest/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/unittest/Makefile.am 2014-03-26 23:46:34.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 3398557 on Wed May 29 23:22:15 2013 -0400 by Dave Heller $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/unittest/Makefile.in sblim-sfcb-1.4.8/test/unittest/Makefile.in --- sblim-sfcb-1.4.6/test/unittest/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/unittest/Makefile.in 2014-03-26 23:56:14.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am 3398557 on Wed May 29 23:22:15 2013 -0400 by Dave Heller $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/wbemcli/Makefile.am sblim-sfcb-1.4.8/test/wbemcli/Makefile.am --- sblim-sfcb-1.4.6/test/wbemcli/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/wbemcli/Makefile.am 2014-03-26 23:46:34.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am a931aee on Thu Mar 4 17:34:55 2010 -0500 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/wbemcli/Makefile.in sblim-sfcb-1.4.8/test/wbemcli/Makefile.in --- sblim-sfcb-1.4.6/test/wbemcli/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/wbemcli/Makefile.in 2014-03-26 23:56:14.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am a931aee on Thu Mar 4 17:34:55 2010 -0500 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/xmltest/Makefile.am sblim-sfcb-1.4.8/test/xmltest/Makefile.am --- sblim-sfcb-1.4.6/test/xmltest/Makefile.am 2013-10-02 15:24:02.000000000 +0000 +++ sblim-sfcb-1.4.8/test/xmltest/Makefile.am 2014-03-26 23:46:34.000000000 +0000 @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am cd904de on Tue Jun 4 19:41:09 2013 -0400 by Michael Chase-Salerno $ # # Makefile.am # diff -Nru sblim-sfcb-1.4.6/test/xmltest/Makefile.in sblim-sfcb-1.4.8/test/xmltest/Makefile.in --- sblim-sfcb-1.4.6/test/xmltest/Makefile.in 2013-10-02 15:31:19.000000000 +0000 +++ sblim-sfcb-1.4.8/test/xmltest/Makefile.in 2014-03-26 23:56:14.000000000 +0000 @@ -15,7 +15,7 @@ @SET_MAKE@ -# $Id: Makefile.am,v 1.105 2010/02/10 20:51:15 buccella Exp $ +# $Id: Makefile.am cd904de on Tue Jun 4 19:41:09 2013 -0400 by Michael Chase-Salerno $ # # Makefile.am #