cluster: RHEL56 - Revert "ccsd: Add error when bind fails"

Lon Hohberger lon at fedoraproject.org
Tue Nov 30 18:35:30 UTC 2010


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=8b471e02592d4a0d667981b9821bc622c9545d80
Commit:        8b471e02592d4a0d667981b9821bc622c9545d80
Parent:        e019fff81ee4d46a32b7a51d94f6de72b540cc44
Author:        Lon Hohberger <lhh at redhat.com>
AuthorDate:    Tue Nov 30 10:01:44 2010 -0500
Committer:     Lon Hohberger <lhh at redhat.com>
CommitterDate: Tue Nov 30 13:14:41 2010 -0500

Revert "ccsd: Add error when bind fails"

This reverts commit eff6913e7cea3be112e6635c168d2215c9735d2b.
---
 ccs/daemon/cluster_mgr.c |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/ccs/daemon/cluster_mgr.c b/ccs/daemon/cluster_mgr.c
index 3fb07fe..7cfa531 100644
--- a/ccs/daemon/cluster_mgr.c
+++ b/ccs/daemon/cluster_mgr.c
@@ -364,7 +364,6 @@ static int handle_cluster_event(cman_handle_t handle)
 
 static void cluster_communicator(void)
 {
-  char addrbuf[64], *res;
   int ccsd_fd = -1;
   int cman_fd = -1;
   int warn_user = 0;
@@ -399,12 +398,7 @@ static void cluster_communicator(void)
   fcntl(ccsd_fd, F_SETFD, flags);
 
   if (bind(ccsd_fd, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-    res = inet_ntop(AF_INET,&sin.sin_addr, addrbuf, sizeof(addrbuf));
-    if (!res) {
-      log_sys_err("Unable to bind socket addr: %s, port: %d, proto: %d", addrbuf, sin.sin_port, sin.sin_family);
-    } else {
-      log_sys_err("Unable to bind to ipv4 socket, but inet_ntop returned NULL pointer");
-    }
+    log_err("Unable to bind to socket.\n");
     close(ccsd_fd);
     exit(EXIT_FAILURE);
   }


More information about the cluster-commits mailing list