]> git.proxmox.com Git - mirror_corosync.git/commitdiff
config: get_cluster_mcast_addr error is not fatal
authorJan Friesse <jfriesse@redhat.com>
Tue, 28 Jun 2016 11:54:50 +0000 (13:54 +0200)
committerJan Friesse <jfriesse@redhat.com>
Tue, 28 Jun 2016 11:57:14 +0000 (13:57 +0200)
Signed-off-by: Jan Friesse <jfriesse@redhat.com>
exec/totemconfig.c

index 32c9f88f10c22e6942cdfce3ec84f08f684deae2..070edbe4022fbf84fcba037502df28a4686a2808 100644 (file)
@@ -1101,16 +1101,14 @@ extern int totem_config_read (
                } else {
                        /*
                         * User not specified address -> autogenerate one from cluster_name key
-                        * (if available)
+                        * (if available). Return code is intentionally ignored, because
+                        * udpu doesn't need mcastaddr and validity of mcastaddr for udp is
+                        * checked later anyway.
                         */
-                       res = get_cluster_mcast_addr (cluster_name,
+                       (void)get_cluster_mcast_addr (cluster_name,
                                        ringnumber,
                                        totem_config->ip_version,
                                        &totem_config->interfaces[ringnumber].mcast_addr);
-                       if (res != 0) {
-                               *error_string = "Can't autogenerate multicast address";
-                               return -1;
-                       }
                }
 
                snprintf(tmp_key, ICMAP_KEYNAME_MAXLEN, "totem.interface.%u.broadcast", ringnumber);