← Back to branch summary

~ubuntu-branches/ubuntu/utopic/pacemaker/utopic-proposed

« back to all changes in this revision

Viewing changes to lib/cib/cib_remote.c

  • Committer: Package Import Robot
  • Author(s): Andres Rodriguez
  • Date: 2013-08-15 11:27:07 UTC
  • mfrom: (1.1.12) (2.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20130815112707-5r864ink7jme3zl5
Tags: 1.1.10+git20130802-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/control: Build-Depends on libqb-dev; Depends on libheartbeat2.
* Corosync's pacemaker plugin is disabled, hence not built:
  - debian/licrmcluster4-dev.install: Do not install plugin.h.
  - debian/pacemaker.install: Do not install pacemaker.lcrso.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/cib/cib_remote.c
218
218
    connection->tls_session = NULL;
219
219
#endif
220
220
    sock = crm_remote_tcp_connect(private->server, private->port);
221
 
    if (sock <= 0) {
 
221
    if (sock < 0) {
222
222
        crm_perror(LOG_ERR, "remote tcp connection to %s:%d failed", private->server,
223
223
                   private->port);
 
224
        return -ENOTCONN;
224
225
    }
225
226
 
226
227
    connection->tcp_socket = sock;