← Back to branch summary

~ubuntu-branches/ubuntu/saucy/389-ds-base/saucy

« back to all changes in this revision

Viewing changes to ldap/servers/plugins/replication/repl_extop.c

  • Committer: Package Import Robot
  • Author(s): Timo Aaltonen
  • Date: 2013-03-12 09:53:20 UTC
  • Revision ID: package-import@ubuntu.com-20130312095320-kd20z6oloopyt133
Tags: 1.3.0.3-1ubuntu1
* Sync from Debian unstable.
  - cve fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
ldap/servers/plugins/replication/repl_extop.c
343
343
        slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
344
344
        slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
345
345
 
346
 
        if (NULL == extop_oid ||
 
346
        if ((NULL == extop_oid) ||
347
347
                ((strcmp(extop_oid, REPL_START_NSDS50_REPLICATION_REQUEST_OID) != 0) &&
348
 
                (strcmp(extop_oid, REPL_START_NSDS90_REPLICATION_REQUEST_OID) != 0)) ||
349
 
                NULL == extop_value || NULL == extop_value->bv_val)
 
348
                 (strcmp(extop_oid, REPL_START_NSDS90_REPLICATION_REQUEST_OID) != 0)) ||
 
349
                !BV_HAS_DATA(extop_value))
350
350
        {
351
351
                /* bogus */
352
352
                rc = -1;
480
480
        slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_OID, &extop_oid);
481
481
        slapi_pblock_get(pb, SLAPI_EXT_OP_REQ_VALUE, &extop_value);
482
482
 
483
 
        if (NULL == extop_oid ||
484
 
                strcmp(extop_oid, REPL_END_NSDS50_REPLICATION_REQUEST_OID) != 0 ||
485
 
                NULL == extop_value || NULL == extop_value->bv_val)
 
483
        if ((NULL == extop_oid) || 
 
484
            (strcmp(extop_oid, REPL_END_NSDS50_REPLICATION_REQUEST_OID) != 0) ||
 
485
            !BV_HAS_DATA(extop_value))
486
486
        {
487
487
                /* bogus */
488
488
                rc = -1;
545
545
        PR_ASSERT(NULL != response_code);
546
546
        PR_ASSERT(NULL != ruv_bervals);
547
547
 
548
 
        if (NULL == bvdata || NULL == response_code || NULL == ruv_bervals ||
549
 
                NULL == data_guid || NULL == data || NULL == bvdata->bv_val)
 
548
        if ((NULL == response_code) || (NULL == ruv_bervals) ||
 
549
            (NULL == data_guid) || (NULL == data) || !BV_HAS_DATA(bvdata))
550
550
        {
551
551
                return_value = -1;
552
552
        }
1413
1413
{
1414
1414
        BerElement *tmp_bere = NULL;
1415
1415
        int rc = 0;
 
1416
        
 
1417
        if (!BV_HAS_DATA(extop_value)) {
 
1418
                rc = -1;
 
1419
                goto free_and_return;                    
 
1420
        }
1416
1421
 
1417
1422
        if ((tmp_bere = ber_init(extop_value)) == NULL){
1418
1423
                rc = -1;