← Back to branch summary

~ubuntu-branches/ubuntu/saucy/ceph/saucy-proposed

« back to all changes in this revision

Viewing changes to src/rgw/rgw_op.cc

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-06-03 18:38:39 UTC
  • mfrom: (1.1.30)
  • Revision ID: package-import@ubuntu.com-20140603183839-qz23rzv7bz2h6rjw
Tags: 0.67.9-0ubuntu1
https://launchpad.net/bugs/1326032
New upstream stable point release (LP: #1326032).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/rgw/rgw_op.cc
418
418
    return -EPERM;
419
419
  }
420
420
 
 
421
  if (!s->system_request &&
 
422
      (required_mask & (RGW_OP_TYPE_WRITE | RGW_OP_TYPE_DELETE)) &&
 
423
      !store->zone.is_master)  {
 
424
    ldout(s->cct, 5) << "NOTICE: modify request to a non-master zone by a non-system user, permission denied"  << dendl;
 
425
    return -EPERM;
 
426
  }
 
427
 
421
428
  return 0;
422
429
}
423
430
 
2538
2545
    rgw_obj obj(bucket,(*iter));
2539
2546
    store->set_atomic(s->obj_ctx, obj);
2540
2547
    ret = store->delete_obj(s->obj_ctx, obj);
 
2548
    if (ret == -ENOENT) {
 
2549
      ret = 0;
 
2550
    }
2541
2551
    result = make_pair(*iter, ret);
2542
2552
 
2543
2553
    send_partial_response(result);