← Back to branch summary

~ubuntu-branches/ubuntu/precise/nordugrid-arc/precise

« back to all changes in this revision

Viewing changes to src/libs/data-staging/DataDeliveryRemoteComm.cpp

  • Committer: Package Import Robot
  • Author(s): Mattias Ellert
  • Date: 2012-03-01 19:48:16 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20120301194816-m1ezrwnwt2qgnc2e
Tags: 1.1.1-1
http://bugs.debian.org/661774
https://launchpad.net/bugs/935007
http://bugs.debian.org/646979
* 1.1.1 Bugfix Release
* Fixes FTBFS (Closes: #661774) (LP: #935007)
* Fix typo in package description (Closes: #646979)
* Split binary rule in debian/rules for arch and indep

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libs/data-staging/DataDeliveryRemoteComm.cpp
44
44
    // connect to service and make a new transfer request
45
45
    Arc::MCCConfig cfg;
46
46
    if (dtr.host_cert_for_remote_delivery()) {
47
 
      Arc::UserConfig host_cfg(Arc::initializeCredentialsType(Arc::initializeCredentialsType::TryCredentials));
 
47
      Arc::initializeCredentialsType cred_type(Arc::initializeCredentialsType::TryCredentials);
 
48
      Arc::UserConfig host_cfg(cred_type);
48
49
      host_cfg.ProxyPath(""); // to force using cert/key files instead of non-existent proxy
49
50
      host_cfg.ApplyToConfig(cfg);
50
51
    } else {
60
61
 
61
62
    Arc::XMLNode dtrnode = request.NewChild("DataDeliveryStart").NewChild("DTR");
62
63
 
63
 
    dtrnode.NewChild("ID") = dtr.get_id();
 
64
    dtrnode.NewChild("ID") = dtr_full_id;
64
65
    dtrnode.NewChild("Source") = surl;
65
66
    dtrnode.NewChild("Destination") = durl;
66
67
    if (dtr.get_source()->CheckCheckSum()) dtrnode.NewChild("CheckSum") = dtr.get_source()->GetCheckSum();
78
79
    // delegate credentials
79
80
    Arc::XMLNode op = request.Child(0);
80
81
    if (!SetupDelegation(op, dtr.get_usercfg())) {
81
 
      logger_->msg(Arc::ERROR, "DTR %s: Failed to set up credential delegation", dtr_id);
 
82
      logger_->msg(Arc::ERROR, "DTR %s: Failed to set up credential delegation with %s",
 
83
                   dtr_id, dtr.get_delivery_endpoint().str());
82
84
      return;
83
85
    }
84
86