Finish the renaming of openais to corosync in the tree.

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@1646 fd59a12c-fef9-0310-b244-a6a79926bd2f

Doxyfile

@@ -129,8 +129,8 @@ EXPAND_ONLY_PREDEF     = YES
 SEARCH_INCLUDES        = YES
 INCLUDE_PATH           = include
 INCLUDE_FILE_PATTERNS  = *.h
-PREDEFINED             = "OPENAIS_BEGIN_DECLS=" 			\
-			 "OPENAIS_END_DECLS=" 			\
+PREDEFINED             = "COROSYNC_BEGIN_DECLS=" 			\
+			 "COROSYNC_END_DECLS=" 			\
 			 "DOXYGEN_SHOULD_SKIP_THIS" 		
 SKIP_FUNCTION_MACROS   = YES
 #---------------------------------------------------------------------------

Makefile.inc

@@ -11,21 +11,21 @@ UNAME=$(shell uname)
 CP=cp
 
 ifeq "$(UNAME)" "Linux"
-	OPENAIS_COMPAT=LINUX
+	COROSYNC_COMPAT=LINUX
 endif
 ifeq "$(UNAME)" "Darwin"
-	OPENAIS_COMPAT=DARWIN
+	COROSYNC_COMPAT=DARWIN
 	CP=rsync
 endif
 ifneq "" "$(findstring BSD,$(UNAME))"
-	OPENAIS_COMPAT=BSD
+	COROSYNC_COMPAT=BSD
 endif
 ifeq "$(UNAME)" "SunOS"
-	OPENAIS_COMPAT=SOLARIS
+	COROSYNC_COMPAT=SOLARIS
 	# Note that CC must be set to gcc compiled to link with gnu-ld 
 endif
-ifndef OPENAIS_COMPAT
-	$(error "OPENAIS_COMPAT cannot be detected, it must be manually defined")
+ifndef COROSYNC_COMPAT
+	$(error "COROSYNC_COMPAT cannot be detected, it must be manually defined")
 endif
 
 # BUILD_DYNAMIC can be defined to 1 to build for dynamic loading of service
@@ -35,13 +35,13 @@ ifndef BUILD_DYNAMIC
 	BUILD_DYNAMIC=1
 endif
 
-# OPENAIS_BUILD can be defined as RELEASE or DEBUG
+# COROSYNC_BUILD can be defined as RELEASE or DEBUG
 #
-ifndef OPENAIS_BUILD
-	OPENAIS_BUILD=DEBUG
+ifndef COROSYNC_BUILD
+	COROSYNC_BUILD=DEBUG
 endif
 
-# OPENAIS_PROFILE
+# COROSYNC_PROFILE
 
 # default CFLAGS, LDFLAGS
 #
@@ -54,50 +54,50 @@ DYFLAGS =
 
 # build CFLAGS, LDFLAGS
 #
-ifeq (${OPENAIS_BUILD}, RELEASE) 
+ifeq (${COROSYNC_BUILD}, RELEASE) 
 	CFLAGS += -O3 -Wall
 # -Wstrict-aliasing=2 TODO sameday fix all of these
-ifndef OPENAIS_PROFILE
+ifndef COROSYNC_PROFILE
 	CFLAGS += -fomit-frame-pointer
 endif
 	LDFLAGS += 
 endif
-ifeq (${OPENAIS_BUILD}, DEBUG) 
+ifeq (${COROSYNC_BUILD}, DEBUG) 
 	CFLAGS += -O0 -g -Wall -DDEBUG
 	LDFLAGS += -g
-	ifeq (${OPENAIS_COMPAT}, SOLARIS)
+	ifeq (${COROSYNC_COMPAT}, SOLARIS)
 		CFLAGS += -Werror -DTS_CLASS
 	endif
 endif
-ifeq (${OPENAIS_BUILD}, COVERAGE)
+ifeq (${COROSYNC_BUILD}, COVERAGE)
 	CFLAGS += -O0 -g -ftest-coverage -fprofile-arcs
 	LDFLAGS += -g -ftest-coverage -fprofile-arcs
 	BUILD_DYNAMIC=0
 endif
 
-ifdef OPENAIS_PROFILE
+ifdef COROSYNC_PROFILE
 	CFLAGS += -pg
 	LDFLAGS += -pg
 endif
 
 # platform specific CFLAGS, LDFLAGS
 #
-ifeq (${OPENAIS_COMPAT}, LINUX) 
-	override CFLAGS += -DOPENAIS_LINUX
+ifeq (${COROSYNC_COMPAT}, LINUX) 
+	override CFLAGS += -DCOROSYNC_LINUX
 	override LDFLAGS += -ldl -lpthread
 	override DYFLAGS += -rdynamic
 endif
-ifeq (${OPENAIS_COMPAT}, BSD)
-	override CFLAGS += -DOPENAIS_BSD
+ifeq (${COROSYNC_COMPAT}, BSD)
+	override CFLAGS += -DCOROSYNC_BSD
 	override LDFLAGS += -pthread
 	override DYFLAGS += -export-dynamic
 endif
-ifeq (${OPENAIS_COMPAT}, DARWIN)
-	override CFLAGS += -DOPENAIS_DARWIN
+ifeq (${COROSYNC_COMPAT}, DARWIN)
+	override CFLAGS += -DCOROSYNC_DARWIN
 	override LDFLAGS += -lpthread
 endif
-ifeq (${OPENAIS_COMPAT}, SOLARIS)
-	override CFLAGS += -DOPENAIS_SOLARIS -D_REENTRANT
+ifeq (${COROSYNC_COMPAT}, SOLARIS)
+	override CFLAGS += -DCOROSYNC_SOLARIS -D_REENTRANT
 	override LDFLAGS += -lpthread
 	# See http://sources.redhat.com/ml/bug-gnu-utils/2000-07/msg00168.html
 	override LDFLAGS += -Wl,--export-dynamic -Wl,-rpath-link=/usr/lib

README.devmap

@@ -889,7 +889,7 @@ used for flow control.  A response message will be sent to the library of the
 size response_size, with the header id of response_id if the totem message
 queue is full.  Some library APIs may not need to block in this condition
 (because they don't have to use totem), so they should specify
-OPENAIS_FLOW_CONTROL_NOT_REQUIREDin the flow control field.
+COROSYNC_FLOW_CONTROL_NOT_REQUIREDin the flow control field.
 
 The libais_handler_fn is a function to be called when the library handler is
 requested to be executed.

exec/Makefile

@@ -42,11 +42,11 @@ ifeq (${BUILD_DYNAMIC}, 1)
 	override LDFLAGS += ${DYFLAGS}
 endif
 
-ifeq (${OPENAIS_COMPAT}, LINUX) 
+ifeq (${COROSYNC_COMPAT}, LINUX) 
 	override LDFLAGS += -ldl
 endif
 
-ifeq (${OPENAIS_COMPAT}, SOLARIS) 
+ifeq (${COROSYNC_COMPAT}, SOLARIS) 
 	override LDFLAGS += -lnsl -lsocket -lrt
 endif
 
@@ -82,7 +82,7 @@ all: libtotem_pg.a liblogsys.a corosync
 endif
 
 
-ifeq (${OPENAIS_COMPAT}, DARWIN)
+ifeq (${COROSYNC_COMPAT}, DARWIN)
 
 objdb.lcrso: objdb.o
 	$(CC) -bundle -bundle_loader ./corosync -bind_at_load objdb.o -o $@
@@ -114,7 +114,7 @@ libtotem_pg.a: $(TOTEM_OBJS)
 liblogsys.a: $(LOGSYS_OBJS)
 	$(AR) -rc liblogsys.a $(LOGSYS_OBJS)
 
-ifeq (${OPENAIS_COMPAT}, DARWIN)
+ifeq (${COROSYNC_COMPAT}, DARWIN)
 
 libtotem_pg.so.2.0.0: $(TOTEM_OBJS)
 	$(CC) $(LDFLAGS) -bundle -bind_at_load $(TOTEM_OBJS) -o $@

exec/crypto.c

@@ -15,7 +15,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/poll.h>
-#if defined(OPENAIS_BSD)
+#if defined(COROSYNC_BSD)
 #include <sys/endian.h>
 #endif
 #include <fcntl.h>
@@ -40,7 +40,7 @@ typedef unsigned long long ulong64;
 #warning "cannot detect byte order"
 #endif
 
-#if defined(OPENAIS_LINUX)
+#if defined(COROSYNC_LINUX)
 #if __WORDIZE == 64
 #define ENDIAN_64BITWORD
 #endif

exec/ipc.c

@@ -57,7 +57,7 @@
 #include <signal.h>
 #include <sched.h>
 #include <time.h>
-#if defined(OPENAIS_SOLARIS) && defined(HAVE_GETPEERUCRED)
+#if defined(COROSYNC_SOLARIS) && defined(HAVE_GETPEERUCRED)
 #include <ucred.h>
 #endif
 
@@ -90,7 +90,7 @@
 
 LOGSYS_DECLARE_SUBSYS ("IPC", LOG_INFO);
 
-#ifdef OPENAIS_SOLARIS
+#ifdef COROSYNC_SOLARIS
 #define MSG_NOSIGNAL 0
 #endif
 
@@ -581,7 +581,7 @@ retry_poll:
 	return (0);
 }
 
-#if defined(OPENAIS_LINUX) || defined(OPENAIS_SOLARIS)
+#if defined(COROSYNC_LINUX) || defined(COROSYNC_SOLARIS)
 /* SUN_LEN is broken for abstract namespace
  */
 #define AIS_SUN_LEN(a) sizeof(*(a))
@@ -589,7 +589,7 @@ retry_poll:
 #define AIS_SUN_LEN(a) SUN_LEN(a)
 #endif
 
-#if defined(OPENAIS_LINUX)
+#if defined(COROSYNC_LINUX)
 char *socketname = "libcorosync.socket";
 #else
 char *socketname = "/var/run/libcorosync.socket";
@@ -671,7 +671,7 @@ static int conn_info_outq_flush (struct conn_info *conn_info) {
 	msg_send.msg_name = 0;
 	msg_send.msg_namelen = 0;
 	msg_send.msg_iovlen = 1;
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	msg_send.msg_control = 0;
 	msg_send.msg_controllen = 0;
 	msg_send.msg_flags = 0;
@@ -739,7 +739,7 @@ static void libais_deliver (struct conn_info *conn_info)
 	int service;
 	struct msghdr msg_recv;
 	struct iovec iov_recv;
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 	struct cmsghdr *cmsg;
 	char cmsg_cred[CMSG_SPACE (sizeof (struct ucred))];
 	struct ucred *cred;
@@ -754,14 +754,14 @@ static void libais_deliver (struct conn_info *conn_info)
 	msg_recv.msg_iovlen = 1;
 	msg_recv.msg_name = 0;
 	msg_recv.msg_namelen = 0;
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	msg_recv.msg_flags = 0;
 
 	if (conn_info->authenticated) {
 		msg_recv.msg_control = 0;
 		msg_recv.msg_controllen = 0;
 	} else {
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 		msg_recv.msg_control = (void *)cmsg_cred;
 		msg_recv.msg_controllen = sizeof (cmsg_cred);
 #else
@@ -777,7 +777,7 @@ static void libais_deliver (struct conn_info *conn_info)
 #endif
 	}
 
-#else	/* OPENAIS_SOLARIS */
+#else	/* COROSYNC_SOLARIS */
 	msg_recv.msg_accrights = 0;
 	msg_recv.msg_accrightslen = 0;
 
@@ -822,7 +822,7 @@ retry_recv:
 		return;
 	} else
 	if (res == 0) {
-#if defined(OPENAIS_SOLARIS) || defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_SOLARIS) || defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 		/* On many OS poll never return POLLHUP or POLLERR.
 		 * EOF is detected when recvmsg return 0.
 		 */
@@ -834,7 +834,7 @@ retry_recv:
 	/*
 	 * Authenticate if this connection has not been authenticated
 	 */
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 	if (conn_info->authenticated == 0) {
 		cmsg = CMSG_FIRSTHDR (&msg_recv);
 		assert (cmsg);
@@ -946,7 +946,7 @@ static int poll_handler_libais_accept (
 	socklen_t addrlen;
 	struct sockaddr_un un_addr;
 	int new_fd;
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 	int on = 1;
 #endif
 	int res;
@@ -979,7 +979,7 @@ retry_accept:
 	/*
 	 * Request credentials of sender provided by kernel
 	 */
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 	setsockopt(new_fd, SOL_SOCKET, SO_PASSCRED, &on, sizeof (on));
 #endif
 
@@ -1055,15 +1055,15 @@ void corosync_ipc_init (
 		corosync_exit_error (AIS_DONE_LIBAIS_SOCKET);
 	}
 
-#if !defined(OPENAIS_LINUX)
+#if !defined(COROSYNC_LINUX)
 	unlink(socketname);
 #endif
 	memset (&un_addr, 0, sizeof (struct sockaddr_un));
 	un_addr.sun_family = AF_UNIX;
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 	un_addr.sun_len = sizeof(struct sockaddr_un);
 #endif
-#if defined(OPENAIS_LINUX)
+#if defined(COROSYNC_LINUX)
 	strcpy (un_addr.sun_path + 1, socketname);
 #else
 	strcpy (un_addr.sun_path, socketname);
@@ -1155,7 +1155,7 @@ int corosync_conn_send_response (
 	msg_send.msg_name = 0;
 	msg_send.msg_namelen = 0;
 	msg_send.msg_iovlen = 1;
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	msg_send.msg_control = 0;
 	msg_send.msg_controllen = 0;
 	msg_send.msg_flags = 0;

exec/logsys.c

@@ -42,10 +42,10 @@
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#if defined(OPENAIS_LINUX)
+#if defined(COROSYNC_LINUX)
 #include <linux/un.h>
 #endif
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 #include <sys/un.h>
 #endif
 #define SYSLOG_NAMES

exec/main.c

@@ -361,7 +361,7 @@ static void aisexec_tty_detach (void)
 
 static void aisexec_setscheduler (void)
 {
-#if ! defined(TS_CLASS) && (defined(OPENAIS_BSD) || defined(OPENAIS_LINUX) || defined(OPENAIS_SOLARIS))
+#if ! defined(TS_CLASS) && (defined(COROSYNC_BSD) || defined(COROSYNC_LINUX) || defined(COROSYNC_SOLARIS))
 	struct sched_param sched_param;
 	int res;
 
@@ -382,20 +382,20 @@ static void aisexec_setscheduler (void)
 
 static void aisexec_mlockall (void)
 {
-#if !defined(OPENAIS_BSD)
+#if !defined(COROSYNC_BSD)
 	int res;
 #endif
 	struct rlimit rlimit;
 
 	rlimit.rlim_cur = RLIM_INFINITY;
 	rlimit.rlim_max = RLIM_INFINITY;
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	setrlimit (RLIMIT_MEMLOCK, &rlimit);
 #else
 	setrlimit (RLIMIT_VMEM, &rlimit);
 #endif
 
-#if defined(OPENAIS_BSD)
+#if defined(COROSYNC_BSD)
 	/* under FreeBSD a process with locked page cannot call dlopen
 	 * code disabled until FreeBSD bug i386/93396 was solved
 	 */

exec/service.h

@@ -32,8 +32,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef OPENAIS_SERVICE_H_DEFINED
-#define OPENAIS_SERVICE_H_DEFINED
+#ifndef COROSYNC_SERVICE_H_DEFINED
+#define COROSYNC_SERVICE_H_DEFINED
 
 /*
  * Link and initialize a service

exec/timer.c

@@ -103,7 +103,7 @@ static void *prioritized_timer_thread (void *data)
 	int fds;
 	unsigned long long timeout;
 
-#if ! defined(TS_CLASS) && (defined(OPENAIS_BSD) || defined(OPENAIS_LINUX) || defined(OPENAIS_SOLARIS))
+#if ! defined(TS_CLASS) && (defined(COROSYNC_BSD) || defined(COROSYNC_LINUX) || defined(COROSYNC_SOLARIS))
 	struct sched_param sched_param;
 	int res;
 
@@ -137,7 +137,7 @@ retry_poll:
 }
 
 static void sigusr1_handler (int num) {
-#ifdef OPENAIS_SOLARIS
+#ifdef COROSYNC_SOLARIS
 	/* Rearm the signal facility */
         signal (num, sigusr1_handler);
 #endif

exec/totemconfig.c

@@ -642,7 +642,7 @@ int totem_config_keyread (
 
 	/* In desperation we read the default filename */
 	if (!got_key) {
-		char *filename = getenv("OPENAIS_TOTEM_AUTHKEY_FILE");
+		char *filename = getenv("COROSYNC_TOTEM_AUTHKEY_FILE");
 		if (!filename)
 			filename = "/etc/ais/authkey";
 		res = read_keyfile(filename, totem_config, error_string);

exec/totemip.c

@@ -41,7 +41,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 #include <sys/sockio.h>
 #include <net/if.h>
 #include <net/if_var.h>
@@ -54,7 +54,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-#if defined(OPENAIS_LINUX)
+#if defined(COROSYNC_LINUX)
 #include <net/if.h>
 
 /* ARGH!! I hate netlink */
@@ -220,7 +220,7 @@ int totemip_totemip_to_sockaddr_convert(struct totem_ip_address *ip_addr,
 		struct sockaddr_in *sin = (struct sockaddr_in *)saddr;
 
 		memset(sin, 0, sizeof(struct sockaddr_in));
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 		sin->sin_len = sizeof(struct sockaddr_in);
 #endif
 		sin->sin_family = ip_addr->family;
@@ -234,7 +234,7 @@ int totemip_totemip_to_sockaddr_convert(struct totem_ip_address *ip_addr,
 		struct sockaddr_in6 *sin = (struct sockaddr_in6 *)saddr;
 
 		memset(sin, 0, sizeof(struct sockaddr_in6));
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 		sin->sin6_len = sizeof(struct sockaddr_in6);
 #endif
 		sin->sin6_family = ip_addr->family;
@@ -307,7 +307,7 @@ int totemip_sockaddr_to_totemip_convert(struct sockaddr_storage *saddr, struct t
 	return ret;
 }
 
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 int totemip_iface_check(struct totem_ip_address *bindnet,
 			struct totem_ip_address *boundto,
 			int *interface_up,
@@ -407,7 +407,7 @@ int totemip_iface_check(struct totem_ip_address *bindnet,
 
 	return (res);
 }
-#elif defined(OPENAIS_LINUX)
+#elif defined(COROSYNC_LINUX)
 
 static void parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
 {
@@ -563,6 +563,6 @@ finished:
 	close(fd);
 	return 0;
 }
-#endif /* OPENAIS_LINUX */
+#endif /* COROSYNC_LINUX */
 
 

exec/totemsrp.c

@@ -689,7 +689,7 @@ int totemsrp_initialize (
 		goto error_destroy;
 	}
 
-	rundir = getenv ("OPENAIS_RUN_DIR");
+	rundir = getenv ("COROSYNC_RUN_DIR");
 	if (rundir == NULL) {
 		rundir = "/var/lib/corosync";
 	}

include/corosync/cfg.h

@@ -32,8 +32,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef AIS_OPENAISCFG_H_DEFINED
-#define AIS_OPENAISCFG_H_DEFINED
+#ifndef AIS_COROSYNCCFG_H_DEFINED
+#define AIS_COROSYNCCFG_H_DEFINED
 
 #include <netinet/in.h>
 #include "saAis.h"
@@ -41,66 +41,66 @@
 typedef SaUint64T corosync_cfg_handle_t;
 
 typedef enum {
-	OPENAIS_CFG_ADMINISTRATIVETARGET_SERVICEUNIT = 0,
-	OPENAIS_CFG_ADMINISTRATIVETARGET_SERVICEGROUP = 1,
-	OPENAIS_CFG_ADMINISTRATIVETARGET_COMPONENTSERVICEINSTANCE = 2,
-	OPENAIS_CFG_ADMINISTRATIVETARGET_NODE = 3
-} OpenaisCfgAdministrativeTargetT;
+	COROSYNC_CFG_ADMINISTRATIVETARGET_SERVICEUNIT = 0,
+	COROSYNC_CFG_ADMINISTRATIVETARGET_SERVICEGROUP = 1,
+	COROSYNC_CFG_ADMINISTRATIVETARGET_COMPONENTSERVICEINSTANCE = 2,
+	COROSYNC_CFG_ADMINISTRATIVETARGET_NODE = 3
+} CorosyncCfgAdministrativeTargetT;
 
 typedef enum {
-	OPENAIS_CFG_ADMINISTRATIVESTATE_UNLOCKED = 0,
-	OPENAIS_CFG_ADMINISTRATIVESTATE_LOCKED = 1,
-	OPENAIS_CFG_ADMINISTRATIVESTATE_STOPPING = 2
-} OpenaisCfgAdministrativeStateT;
+	COROSYNC_CFG_ADMINISTRATIVESTATE_UNLOCKED = 0,
+	COROSYNC_CFG_ADMINISTRATIVESTATE_LOCKED = 1,
+	COROSYNC_CFG_ADMINISTRATIVESTATE_STOPPING = 2
+} CorosyncCfgAdministrativeStateT;
 
 typedef enum {
-	OPENAIS_CFG_OPERATIONALSTATE_ENABLED = 1,
-	OPENAIS_CFG_OPERATIONALSTATE_DISABLED = 2
-} OpenaisCfgOperationalStateT;
+	COROSYNC_CFG_OPERATIONALSTATE_ENABLED = 1,
+	COROSYNC_CFG_OPERATIONALSTATE_DISABLED = 2
+} CorosyncCfgOperationalStateT;
 
 typedef enum {
-	OPENAIS_CFG_READINESSSTATE_OUTOFSERVICE = 1,
-	OPENAIS_CFG_READINESSSTATE_INSERVICE = 2,
-	OPENAIS_CFG_READINESSSTATE_STOPPING = 3
-} OpenaisCfgReadinessStateT;
+	COROSYNC_CFG_READINESSSTATE_OUTOFSERVICE = 1,
+	COROSYNC_CFG_READINESSSTATE_INSERVICE = 2,
+	COROSYNC_CFG_READINESSSTATE_STOPPING = 3
+} CorosyncCfgReadinessStateT;
 
 typedef enum {
-	OPENAIS_CFG_PRESENCESTATE_UNINSTANTIATED = 1,
-	OPENAIS_CFG_PRESENCESTATE_INSTANTIATING = 2,
-	OPENAIS_CFG_PRESENCESTATE_INSTANTIATED = 3,
-	OPENAIS_CFG_PRESENCESTATE_TERMINATING = 4,
-	OPENAIS_CFG_PRESENCESTATE_RESTARTING = 5,
-	OPENAIS_CFG_PRESENCESTATE_INSTANTIATION_FAILED = 6,
-	OPENAIS_CFG_PRESENCESTATE_TERMINATION_FAILED = 7
-} OpenaisCfgPresenceStateT;
+	COROSYNC_CFG_PRESENCESTATE_UNINSTANTIATED = 1,
+	COROSYNC_CFG_PRESENCESTATE_INSTANTIATING = 2,
+	COROSYNC_CFG_PRESENCESTATE_INSTANTIATED = 3,
+	COROSYNC_CFG_PRESENCESTATE_TERMINATING = 4,
+	COROSYNC_CFG_PRESENCESTATE_RESTARTING = 5,
+	COROSYNC_CFG_PRESENCESTATE_INSTANTIATION_FAILED = 6,
+	COROSYNC_CFG_PRESENCESTATE_TERMINATION_FAILED = 7
+} CorosyncCfgPresenceStateT;
 
 typedef enum {
-	OPENAIS_CFG_STATETYPE_OPERATIONAL = 0,
-	OPENAIS_CFG_STATETYPE_ADMINISTRATIVE = 1,
-	OPENAIS_CFG_STATETYPE_READINESS = 2,
-	OPENAIS_CFG_STATETYPE_HA = 3,
-	OPENAIS_CFG_STATETYPE_PRESENCE = 4
-} OpenaisCfgStateTypeT;
+	COROSYNC_CFG_STATETYPE_OPERATIONAL = 0,
+	COROSYNC_CFG_STATETYPE_ADMINISTRATIVE = 1,
+	COROSYNC_CFG_STATETYPE_READINESS = 2,
+	COROSYNC_CFG_STATETYPE_HA = 3,
+	COROSYNC_CFG_STATETYPE_PRESENCE = 4
+} CorosyncCfgStateTypeT;
 
 typedef struct {
 	SaNameT name;
-	OpenaisCfgStateTypeT stateType;
-	OpenaisCfgAdministrativeStateT administrativeState;
-} OpenaisCfgStateNotificationT;
+	CorosyncCfgStateTypeT stateType;
+	CorosyncCfgAdministrativeStateT administrativeState;
+} CorosyncCfgStateNotificationT;
 
 typedef struct {
         SaUint32T numberOfItems;
-        OpenaisCfgStateNotificationT *notification;
-} OpenaisCfgStateNotificationBufferT;
+        CorosyncCfgStateNotificationT *notification;
+} CorosyncCfgStateNotificationBufferT;
 
-typedef void (*OpenaisCfgStateTrackCallbackT) (
-	OpenaisCfgStateNotificationBufferT *notificationBuffer,
+typedef void (*CorosyncCfgStateTrackCallbackT) (
+	CorosyncCfgStateNotificationBufferT *notificationBuffer,
 	SaAisErrorT error);
 
 typedef struct {
-	OpenaisCfgStateTrackCallbackT
+	CorosyncCfgStateTrackCallbackT
 		corosyncCfgStateTrackCallback;
-} OpenaisCfgCallbacksT;
+} CorosyncCfgCallbacksT;
 
 /*
  * Interfaces
@@ -112,7 +112,7 @@ extern "C" {
 SaAisErrorT
 corosync_cfg_initialize (
 	corosync_cfg_handle_t *cfg_handle,
-	const OpenaisCfgCallbacksT *cfgCallbacks);
+	const CorosyncCfgCallbacksT *cfgCallbacks);
 
 SaAisErrorT
 corosync_cfg_fd_get (
@@ -154,20 +154,20 @@ corosync_cfg_service_unload (
 SaAisErrorT
 corosync_cfg_administrative_state_get (
 	corosync_cfg_handle_t cfg_handle,
-	OpenaisCfgAdministrativeTargetT administrativeTarget,
-	OpenaisCfgAdministrativeStateT *administrativeState);
+	CorosyncCfgAdministrativeTargetT administrativeTarget,
+	CorosyncCfgAdministrativeStateT *administrativeState);
 
 SaAisErrorT
 corosync_cfg_administrative_state_set (
 	corosync_cfg_handle_t cfg_handle,
-	OpenaisCfgAdministrativeTargetT administrativeTarget,
-	OpenaisCfgAdministrativeStateT administrativeState);
+	CorosyncCfgAdministrativeTargetT administrativeTarget,
+	CorosyncCfgAdministrativeStateT administrativeState);
 
 SaAisErrorT
 corosync_cfg_state_track (
         corosync_cfg_handle_t cfg_handle,
         SaUint8T trackFlags,
-        const OpenaisCfgStateNotificationT *notificationBuffer);
+        const CorosyncCfgStateNotificationT *notificationBuffer);
 
 SaAisErrorT
 corosync_cfg_state_track_stop (
@@ -177,4 +177,4 @@ corosync_cfg_state_track_stop (
 }
 #endif
 
-#endif /* AIS_OPENAISCFG_H_DEFINED */
+#endif /* AIS_COROSYNCCFG_H_DEFINED */

include/corosync/confdb.h

@@ -31,8 +31,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef OPENAIS_CONFDB_H_DEFINED
-#define OPENAIS_CONFDB_H_DEFINED
+#ifndef COROSYNC_CONFDB_H_DEFINED
+#define COROSYNC_CONFDB_H_DEFINED
 
 /**
  * @addtogroup confdb_corosync
@@ -267,4 +267,4 @@ confdb_error_t confdb_key_iter (
 	int *value_len);
 
 
-#endif /* OPENAIS_CONFDB_H_DEFINED */
+#endif /* COROSYNC_CONFDB_H_DEFINED */

include/corosync/cpg.h

@@ -31,8 +31,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef OPENAIS_CPG_H_DEFINED
-#define OPENAIS_CPG_H_DEFINED
+#ifndef COROSYNC_CPG_H_DEFINED
+#define COROSYNC_CPG_H_DEFINED
 
 #include <netinet/in.h>
 
@@ -218,4 +218,4 @@ cpg_error_t cpg_flow_control_state_get (
 	cpg_handle_t handle,
 	cpg_flow_control_state_t *flow_control_enabled);
 
-#endif /* OPENAIS_CPG_H_DEFINED */
+#endif /* COROSYNC_CPG_H_DEFINED */

include/corosync/engine/coroapi.h

@@ -35,7 +35,7 @@
 #define COROAPI_H_DEFINED
 
 #include <stdio.h>
-#ifdef OPENAIS_BSD
+#ifdef COROSYNC_BSD
 #include <sys/uio.h>
 #endif
 

include/corosync/evs.h

@@ -31,8 +31,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef OPENAIS_EVS_H_DEFINED
-#define OPENAIS_EVS_H_DEFINED
+#ifndef COROSYNC_EVS_H_DEFINED
+#define COROSYNC_EVS_H_DEFINED
 
 #include <sys/types.h>
 #include <netinet/in.h>
@@ -187,4 +187,4 @@ evs_error_t evs_membership_get (
 	unsigned int *member_list,
 	unsigned int *member_list_entries);
 
-#endif /* OPENAIS_EVS_H_DEFINED */
+#endif /* COROSYNC_EVS_H_DEFINED */

include/corosync/ipc_cfg.h

@@ -64,7 +64,7 @@ enum res_lib_cfg_types {
 struct req_lib_cfg_statetrack {
 	mar_req_header_t header;
 	SaUint8T trackFlags;
-	OpenaisCfgStateNotificationT *notificationBufferAddress;
+	CorosyncCfgStateNotificationT *notificationBufferAddress;
 };
 
 struct res_lib_cfg_statetrack {
@@ -82,8 +82,8 @@ struct res_lib_cfg_statetrackstop {
 struct req_lib_cfg_administrativestateset {
 	mar_req_header_t header;
 	SaNameT compName;
-	OpenaisCfgAdministrativeTargetT administrativeTarget;
-	OpenaisCfgAdministrativeStateT administrativeState;
+	CorosyncCfgAdministrativeTargetT administrativeTarget;
+	CorosyncCfgAdministrativeStateT administrativeState;
 };
 
 struct res_lib_cfg_administrativestateset {
@@ -93,8 +93,8 @@ struct res_lib_cfg_administrativestateset {
 struct req_lib_cfg_administrativestateget {
 	mar_req_header_t header;
 	SaNameT compName;
-	OpenaisCfgAdministrativeTargetT administrativeTarget;
-	OpenaisCfgAdministrativeStateT administrativeState;
+	CorosyncCfgAdministrativeTargetT administrativeTarget;
+	CorosyncCfgAdministrativeStateT administrativeState;
 };
 
 struct res_lib_cfg_administrativestateget {

include/corosync/mar_gen.h

@@ -36,7 +36,7 @@
 #ifndef AIS_MAR_GEN_H_DEFINED
 #define AIS_MAR_GEN_H_DEFINED
 
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 #include <stdint.h>
 #else
 #include <sys/types.h>

include/corosync/queue.h

@@ -38,7 +38,7 @@
 #include <pthread.h>
 #include "assert.h"
 
-#ifdef OPENAIS_SOLARIS
+#ifdef COROSYNC_SOLARIS
 /* struct queue is already defined in sys/stream.h on Solaris */
 #define	queue _queue
 #endif

include/corosync/rmd.h

@@ -31,8 +31,8 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef OPENAIS_RMD_H_DEFINED
-#define OPENAIS_RMD_H_DEFINED
+#ifndef COROSYNC_RMD_H_DEFINED
+#define COROSYNC_RMD_H_DEFINED
 
 #include <netinet/in.h>
 
@@ -169,4 +169,4 @@ rmd_error_t rmd_delete (
 	rmd_handle_t *handle,
 	void *key_name, int key_len);
 
-#endif /* OPENAIS_RMD_H_DEFINED */
+#endif /* COROSYNC_RMD_H_DEFINED */

include/corosync/saAis.h

@@ -45,7 +45,7 @@ typedef enum {
 	SA_TRUE = 1
 } SaBoolT;
 
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 #include <stdint.h>
 #else
 #include <sys/types.h>

lcr/Makefile

@@ -28,11 +28,11 @@ include ../Makefile.inc
 
 override LDFLAGS += -L./ ${DYFLAGS}
 
-ifeq (${OPENAIS_COMPAT}, LINUX) 
+ifeq (${COROSYNC_COMPAT}, LINUX) 
 	LDFLAGS += -ldl
 endif
 
-ifeq (${OPENAIS_COMPAT}, SOLARIS)
+ifeq (${COROSYNC_COMPAT}, SOLARIS)
 	override LDFLAGS += -lnsl -lsocket
 endif
 
@@ -41,7 +41,7 @@ all:liblcr.a test test_static uic libtest_a.lcrso libtest_b.lcrso
 liblcr.a: lcr_ifact.o
 	$(AR) -rc liblcr.a lcr_ifact.o
 
-ifeq (${OPENAIS_COMPAT}, DARWIN)
+ifeq (${COROSYNC_COMPAT}, DARWIN)
 
 libtest_a.lcrso: libtest_a.o
 	$(CC) $(CFLAGS) -bundle -bundle_loader ./test libtest_a.o -o $@

lcr/lcr_ifact.c

@@ -35,7 +35,7 @@
 #include <string.h>
 #include <unistd.h>
 #include <fnmatch.h>
-#ifdef OPENAIS_SOLARIS
+#ifdef COROSYNC_SOLARIS
 #include <iso/limits_iso.h>
 #endif
 #include <corosync/lcr/lcr_comp.h>
@@ -72,7 +72,7 @@ static struct hdb_handle_database lcr_iface_instance_database = {
 
 static unsigned int g_component_handle = 0xFFFFFFFF;
 
-#if defined(OPENAIS_LINUX) || defined(OPENAIS_SOLARIS)
+#if defined(COROSYNC_LINUX) || defined(COROSYNC_SOLARIS)
 static int lcr_select_so (const struct dirent *dirent)
 #else
 static int lcr_select_so (struct dirent *dirent)
@@ -90,8 +90,8 @@ static int lcr_select_so (struct dirent *dirent)
 	return (0);
 }
 
-#ifndef OPENAIS_SOLARIS
-#ifdef OPENAIS_LINUX
+#ifndef COROSYNC_SOLARIS
+#ifdef COROSYNC_LINUX
 static int pathlist_select (const struct dirent *dirent)
 #else
 static int pathlist_select (struct dirent *dirent)
@@ -207,7 +207,7 @@ static void ld_library_path_build (void)
 
 static int ldso_path_build (char *path, char *filename)
 {
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	FILE *fp;
 	char string[1024];
 	char filename_cat[1024];
@@ -265,7 +265,7 @@ static int ldso_path_build (char *path, char *filename)
 	return (0);
 }
 
-#if defined (OPENAIS_SOLARIS) && !defined(HAVE_SCANDIR)
+#if defined (COROSYNC_SOLARIS) && !defined(HAVE_SCANDIR)
 static int scandir (
 	const char *dir, struct dirent ***namelist,
 	int (*filter)(const struct dirent *),
@@ -334,7 +334,7 @@ fail:
 }
 #endif
 
-#if defined (OPENAIS_SOLARIS) && !defined(HAVE_ALPHASORT)
+#if defined (COROSYNC_SOLARIS) && !defined(HAVE_ALPHASORT)
 static int alphasort (const struct dirent **a, const struct dirent **b)
 {
 	return strcmp ((*a)->d_name, (*b)->d_name);

lcr/uic.c

@@ -48,7 +48,7 @@
 #include <sys/poll.h>
 #include <string.h>
 
-#if defined(OPENAIS_LINUX) || defined(OPENAIS_SOLARIS)
+#if defined(COROSYNC_LINUX) || defined(COROSYNC_SOLARIS)
 /* SUN_LEN is broken for abstract namespace 
  */
 #define AIS_SUN_LEN(a) sizeof(*(a))
@@ -56,7 +56,7 @@
 #define AIS_SUN_LEN(a) SUN_LEN(a)
 #endif
 
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 static char *socketname = "lcr.socket";
 #else
 static char *socketname = "/var/run/lcr.socket";
@@ -68,11 +68,11 @@ int uic_connect (int *fd)
 	struct sockaddr_un addr;
 
 	memset (&addr, 0, sizeof (struct sockaddr_un));
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 	addr.sun_len = sizeof(struct sockaddr_un);
 #endif
 	addr.sun_family = PF_UNIX;
-#if defined(OPENAIS_LINUX)
+#if defined(COROSYNC_LINUX)
 	strcpy (addr.sun_path + 1, socketname);
 #else
 	strcpy (addr.sun_path, socketname);
@@ -110,7 +110,7 @@ int uic_msg_send (int fd, char *msg)
 	msg_send.msg_iovlen = 2;
 	msg_send.msg_name = 0;
 	msg_send.msg_namelen = 0;
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	msg_send.msg_control = 0;
 	msg_send.msg_controllen = 0;
 	msg_send.msg_flags = 0;

lcr/uis.c

@@ -50,7 +50,7 @@
 
 #define SERVER_BACKLOG 5
 
-#if defined(OPENAIS_LINUX) || defined(OPENAIS_SOLARIS)
+#if defined(COROSYNC_LINUX) || defined(COROSYNC_SOLARIS)
 /* SUN_LEN is broken for abstract namespace 
  */
 #define AIS_SUN_LEN(a) sizeof(*(a))
@@ -58,7 +58,7 @@
 #define AIS_SUN_LEN(a) SUN_LEN(a)
 #endif
 
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 static char *socketname = "lcr.socket";
 #else
 static char *socketname = "/var/run/lcr.socket";
@@ -78,15 +78,15 @@ static void uis_lcr_bind (int *server_fd)
 		printf ("lcr_bind failed\n");
 	};
 
-#if !defined(OPENAIS_LINUX)
+#if !defined(COROSYNC_LINUX)
 	unlink(socketname);
 #endif
 	memset (&un_addr, 0, sizeof (struct sockaddr_un));
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 	un_addr.sun_len = sizeof(struct sockaddr_un);
 #endif
 	un_addr.sun_family = AF_UNIX;
-#if defined(OPENAIS_LINUX)
+#if defined(COROSYNC_LINUX)
 	strcpy (un_addr.sun_path + 1, socketname);
 #else
 	strcpy (un_addr.sun_path, socketname);
@@ -147,7 +147,7 @@ static void *lcr_uis_server (void *data)
 	struct sockaddr_un un_addr;
 	socklen_t addrlen;
 	int nfds = 1;
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 	int on = 1;
 #endif
 	int res;
@@ -164,7 +164,7 @@ static void *lcr_uis_server (void *data)
 		if (nfds == 1 && ufds[0].revents & POLLIN) {
 			ufds[1].fd = accept (ufds[0].fd,
 				(struct sockaddr *)&un_addr, &addrlen);
-#ifdef OPENAIS_LINUX			
+#ifdef COROSYNC_LINUX			
 			setsockopt(ufds[1].fd, SOL_SOCKET, SO_PASSCRED,
 				&on, sizeof (on));
 #endif

lib/Makefile

@@ -46,7 +46,7 @@ all: libcpg.a libcpg.so.2.0.0 \
 libcoroutil.a: util.o
 	$(AR) -rc libcoroutil.a util.o
 
-ifeq (${OPENAIS_COMPAT}, DARWIN)
+ifeq (${COROSYNC_COMPAT}, DARWIN)
 
 DARWIN_OPTS=-dynamiclib -bind_at_load -current_version 2.0.0 -compatibility_version 2.0.0
 libcoroutil.so.2.0.0: util.o

lib/cfg.c

@@ -63,7 +63,7 @@ struct res_overlay {
 struct cfg_instance {
 	int response_fd;
 	int dispatch_fd;
-	OpenaisCfgCallbacksT callbacks;
+	CorosyncCfgCallbacksT callbacks;
 	SaNameT compName;
 	int compRegistered;
 	int finalize;
@@ -97,7 +97,7 @@ void cfg_handleInstanceDestructor (void *instance)
 SaAisErrorT
 corosync_cfg_initialize (
 	corosync_cfg_handle_t *cfg_handle,
-	const OpenaisCfgCallbacksT *cfgCallbacks)
+	const CorosyncCfgCallbacksT *cfgCallbacks)
 {
 	struct cfg_instance *cfg_instance;
 	SaAisErrorT error = SA_AIS_OK;
@@ -123,7 +123,7 @@ corosync_cfg_initialize (
 	}
 
 	if (cfgCallbacks) {
-	memcpy (&cfg_instance->callbacks, cfgCallbacks, sizeof (OpenaisCfgCallbacksT));
+	memcpy (&cfg_instance->callbacks, cfgCallbacks, sizeof (CorosyncCfgCallbacksT));
 	}
 
 	pthread_mutex_init (&cfg_instance->response_mutex, NULL);
@@ -179,7 +179,7 @@ corosync_cfg_dispatch (
 	struct res_lib_corosync_csiremovecallback *res_lib_corosync_csiremovecallback;
 	struct res_lib_cfg_statetrackcallback *res_lib_cfg_statetrackcallback;
 #endif
-	OpenaisCfgCallbacksT callbacks;
+	CorosyncCfgCallbacksT callbacks;
 	struct res_overlay dispatch_data;
 
 	error = saHandleInstanceGet (&cfg_hdb, cfg_handle,
@@ -260,7 +260,7 @@ corosync_cfg_dispatch (
 		 * A risk of this dispatch method is that the callback routines may
 		 * operate at the same time that cfgFinalize has been called in another thread.
 		 */
-		memcpy (&callbacks, &cfg_instance->callbacks, sizeof (OpenaisCfgCallbacksT));
+		memcpy (&callbacks, &cfg_instance->callbacks, sizeof (CorosyncCfgCallbacksT));
 		pthread_mutex_unlock (&cfg_instance->dispatch_mutex);
 
 		/*
@@ -536,7 +536,7 @@ SaAisErrorT
 corosync_cfg_state_track (
 	corosync_cfg_handle_t cfg_handle,
 	SaUint8T trackFlags,
-	const OpenaisCfgStateNotificationT *notificationBuffer)
+	const CorosyncCfgStateNotificationT *notificationBuffer)
 {
 	struct cfg_instance *cfg_instance;
 	struct req_lib_cfg_statetrack req_lib_cfg_statetrack;
@@ -546,7 +546,7 @@ corosync_cfg_state_track (
 	req_lib_cfg_statetrack.header.size = sizeof (struct req_lib_cfg_statetrack);
 	req_lib_cfg_statetrack.header.id = MESSAGE_REQ_CFG_STATETRACKSTART;
 	req_lib_cfg_statetrack.trackFlags = trackFlags;
-	req_lib_cfg_statetrack.notificationBufferAddress = (OpenaisCfgStateNotificationT *)notificationBuffer;
+	req_lib_cfg_statetrack.notificationBufferAddress = (CorosyncCfgStateNotificationT *)notificationBuffer;
 
 	error = saHandleInstanceGet (&cfg_hdb, cfg_handle,
 		(void *)&cfg_instance);
@@ -605,8 +605,8 @@ corosync_cfg_state_track_stop (
 SaAisErrorT
 corosync_cfg_admin_state_get (
 	corosync_cfg_handle_t cfg_handle,
-	OpenaisCfgAdministrativeTargetT administrativeTarget,
-	OpenaisCfgAdministrativeStateT *administrativeState)
+	CorosyncCfgAdministrativeTargetT administrativeTarget,
+	CorosyncCfgAdministrativeStateT *administrativeState)
 {
 	struct cfg_instance *cfg_instance;
 	struct req_lib_cfg_administrativestateget req_lib_cfg_administrativestateget;
@@ -641,8 +641,8 @@ corosync_cfg_admin_state_get (
 SaAisErrorT
 corosync_cfg_admin_state_set (
 	corosync_cfg_handle_t cfg_handle,
-	OpenaisCfgAdministrativeTargetT administrativeTarget,
-	OpenaisCfgAdministrativeStateT administrativeState)
+	CorosyncCfgAdministrativeTargetT administrativeTarget,
+	CorosyncCfgAdministrativeStateT administrativeState)
 {
 	struct cfg_instance *cfg_instance;
 	struct req_lib_cfg_administrativestateset req_lib_cfg_administrativestateset;

lib/confdb.c

@@ -148,7 +148,7 @@ confdb_error_t confdb_initialize (
 		goto error_destroy;
 	}
 
-	if (getenv("OPENAIS_DEFAULT_CONFIG_IFACE")) {
+	if (getenv("COROSYNC_DEFAULT_CONFIG_IFACE")) {
 		error = confdb_sa_init();
 		confdb_inst->standalone = 1;
 	}

lib/libcfg.versions

@@ -1,6 +1,6 @@
 # Version and symbol export for libcfg.so
 
-OPENAIS_CFG_0.82 {
+COROSYNC_CFG_0.82 {
 	global:
 		corosync_cfg_initialize;
 		corosync_cfg_fd_get;

lib/libconfdb.versions

@@ -1,6 +1,6 @@
 # Version and symbol export for libconfdb.so
 
-OPENAIS_CONFDB_1.0 {
+COROSYNC_CONFDB_1.0 {
 	global:
 		confdb_initialize;
 		confdb_finalize;

lib/libcoroutil.versions

@@ -1,6 +1,6 @@
 # Version and symbol export for libaisutil.so
 
-OPENAIS_UTIL_2.0 {
+COROSYNC_UTIL_2.0 {
 	global:
 		saHandleCreate;
 		saHandleDestroy;

lib/libcpg.versions

@@ -1,6 +1,6 @@
 # Version and symbol export for libcpg.so
 
-OPENAIS_CPG_1.0 {
+COROSYNC_CPG_1.0 {
 	global:
 		cpg_initialize;
 		cpg_finalize;

lib/libevs.versions

@@ -1,6 +1,6 @@
 # Version and symbol export for libSaClm.so
 
-OPENAIS_EVS_2.0 {
+COROSYNC_EVS_2.0 {
 	global:
 		evs_initialize;
 		evs_finalize;

lib/util.c

@@ -70,11 +70,11 @@ struct saHandle {
 	uint32_t check;
 };
 
-#ifdef OPENAIS_SOLARIS
+#ifdef COROSYNC_SOLARIS
 #define MSG_NOSIGNAL 0
 #endif
 
-#if defined(OPENAIS_LINUX) || defined(OPENAIS_SOLARIS)
+#if defined(COROSYNC_LINUX) || defined(COROSYNC_SOLARIS)
 /* SUN_LEN is broken for abstract namespace 
  */
 #define AIS_SUN_LEN(a) sizeof(*(a))
@@ -82,7 +82,7 @@ struct saHandle {
 #define AIS_SUN_LEN(a) SUN_LEN(a)
 #endif
 
-#ifdef OPENAIS_LINUX
+#ifdef COROSYNC_LINUX
 static char *socketname = "libcorosync.socket";
 #else
 static char *socketname = "/var/run/libcorosync.socket";
@@ -120,11 +120,11 @@ saServiceConnect (
 	setregid (egid, -1);
 
 	memset (&address, 0, sizeof (struct sockaddr_un));
-#if defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 	address.sun_len = sizeof(struct sockaddr_un);
 #endif
 	address.sun_family = PF_UNIX;
-#if defined(OPENAIS_LINUX)
+#if defined(COROSYNC_LINUX)
 	strcpy (address.sun_path + 1, socketname);
 #else
 	strcpy (address.sun_path, socketname);
@@ -235,7 +235,7 @@ saRecvRetry (
 	msg_recv.msg_iovlen = 1;
 	msg_recv.msg_name = 0;
 	msg_recv.msg_namelen = 0;
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	msg_recv.msg_control = 0;
 	msg_recv.msg_controllen = 0;
 	msg_recv.msg_flags = 0;
@@ -255,7 +255,7 @@ retry_recv:
 	if (result == -1 && errno == EAGAIN) {
 		goto retry_recv;
 	}
-#if defined(OPENAIS_SOLARIS) || defined(OPENAIS_BSD) || defined(OPENAIS_DARWIN)
+#if defined(COROSYNC_SOLARIS) || defined(COROSYNC_BSD) || defined(COROSYNC_DARWIN)
 	/* On many OS poll never return POLLHUP or POLLERR.
 	 * EOF is detected when recvmsg return 0.
 	 */
@@ -294,7 +294,7 @@ saSendRetry (
 	msg_send.msg_iovlen = 1;
 	msg_send.msg_name = 0;
 	msg_send.msg_namelen = 0;
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	msg_send.msg_control = 0;
 	msg_send.msg_controllen = 0;
 	msg_send.msg_flags = 0;
@@ -388,7 +388,7 @@ SaAisErrorT saSendMsgRetry (
 	msg_send.msg_iovlen = iov_len_sendmsg;
 	msg_send.msg_name = 0;
 	msg_send.msg_namelen = 0;
-#ifndef OPENAIS_SOLARIS
+#ifndef COROSYNC_SOLARIS
 	msg_send.msg_control = 0;
 	msg_send.msg_controllen = 0;
 	msg_send.msg_flags = 0;

man/confdb_dispatch.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_DISPATCH 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_DISPATCH 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_dispatch \- Dispatches callbacks from the CONFDB service
 .SH SYNOPSIS

man/confdb_fd_get.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_FD_GET 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_FD_GET 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_fd_get \- Dispatches callbacks from the CONFDB service
 .SH SYNOPSIS

man/confdb_finalize.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_FINALIZE 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_FINALIZE 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_finalize \- Terminate a connection to the CONFDB service
 .SH SYNOPSIS

man/confdb_initialize.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_INITIALIZE 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_INITIALIZE 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_initialize \- Create a new connection to the ConfDb service
 .SH SYNOPSIS

man/confdb_key_create.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_KEY_CREATE 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_KEY_CREATE 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_key_create \- Add a new key/value pair to the Configuration Database
 .SH SYNOPSIS

man/confdb_key_delete.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_KEY_DELETE 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_KEY_DELETE 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_key_delete \- Delete a key/value pair from the Configuration Database
 .SH SYNOPSIS

man/confdb_key_iter.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_KEY_ITER 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_KEY_ITER 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_key_iter \- Iterate through key/value pairs in the Configuration Database
 .SH SYNOPSIS

man/confdb_key_replace.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_KEY_REPLACE 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_KEY_REPLACE 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_key_replace \- Replace a key/value pair from the Configuration Database
 .SH SYNOPSIS

man/confdb_object_create.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_OBJECT_CREATE 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_OBJECT_CREATE 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_object_create \- Create a new object in the Configuration Database
 .SH SYNOPSIS

man/confdb_object_destroy.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_* 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_* 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_object_destroy \- Remove an object from the Configuration Database
 .SH SYNOPSIS

man/confdb_object_find.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_OBJECT_FIND 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_OBJECT_FIND 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_object_find \- Find a named object in the Configuration Database
 .SH SYNOPSIS

man/confdb_object_iter.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_OBJECT_ITER 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_OBJECT_ITER 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_object_iter \- Iterate through objects in the Configuration Database
 .SH SYNOPSIS

man/confdb_object_parent_get.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_OBJECT_PARENT_GET 3 2008-04-17 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_OBJECT_PARENT_GET 3 2008-04-17 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 confdb_parent_get \- Configuration Database Object Parent
 .SH SYNOPSIS

man/confdb_overview.8

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CONFDB_OVERVIEW 8 2006-03-06 "corosync Man Page" "Openais Programmer's Manual"
+.TH CONFDB_OVERVIEW 8 2006-03-06 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH OVERVIEW
 The CONFDB library is delivered with the corosync project.  This library is used
 to examine manipulate the configuratin databser used by corosync.

man/corosync.conf.5

@@ -32,7 +32,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH OPENAIS_CONF 5 2006-03-28 "corosync Man Page" "Openais Programmer's Manual"
+.TH COROSYNC_CONF 5 2006-03-28 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 corosync.conf - corosync executive configuration file
 

man/corosync_overview.8

@@ -32,7 +32,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH OPENAIS_OVERVIEW 8 2006-05-10 "corosync Man Page" "Openais Programmer's Manual"
+.TH COROSYNC_OVERVIEW 8 2006-05-10 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH OVERVIEW
 The corosync project is a project to implement a production quality "Revised BSD"
 licensed implementation of the most recent SA Forum's Application Interface
@@ -205,20 +205,20 @@ The corosync executive process uses four environment variables during startup.
 If these environment variables are not set, defaults will be used.
 
 .TP
-OPENAIS_MAIN_CONFIG_FILE
+COROSYNC_MAIN_CONFIG_FILE
 This specifies the fully qualified path to the corosync configuration file.
 
 The default is /etc/ais/corosync.conf.
 
 .TP
-OPENAIS_AMF_CONFIG_FILE
+COROSYNC_AMF_CONFIG_FILE
 This specifies the fully qualified path to the corosync Availability Management
 Framework configuration file.
 
 The default is /etc/ais/amf.conf.
 
 .TP
-OPENAIS_DEFAULT_CONFIG_IFACE
+COROSYNC_DEFAULT_CONFIG_IFACE
 This specifies the LCRSO that is used to parse the configuration file.  This
 allows other configuration file parsers to be implemented within the system.
 
@@ -226,7 +226,7 @@ The default is to use the default corosync configuration file parser which
 parses the format specified in corosync.conf (5).
 
 .TP
-OPENAIS_TOTEM_AUTHKEY_FILE
+COROSYNC_TOTEM_AUTHKEY_FILE
 This specifies the fully qualified path to the shared key used to
 authenticate and encrypt data used within the Totem protocol.
 

man/cpg_context_get.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_CONTEXT_GET 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_CONTEXT_GET 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_context_get \- Gets the context variable for a CPG instance
 .SH SYNOPSIS

man/cpg_context_set.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_CONTEXT_SET 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_CONTEXT_SET 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_context_set \- Sets the context variable for a CPG instance
 .SH SYNOPSIS

man/cpg_dispatch.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_DISPATCH 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_DISPATCH 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_dispatch \- Dispatches callbacks from the CPG service
 .SH SYNOPSIS

man/cpg_fd_get.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_FD_GET 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_FD_GET 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_fd_get \- Dispatches callbacks from the CPG service
 .SH SYNOPSIS

man/cpg_finalize.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_FINALIZE 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_FINALIZE 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_finalize \- Terminate a connection to the CPG service
 .SH SYNOPSIS

man/cpg_initialize.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_INITIALIZE 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_INITIALIZE 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_initialize \- Create a new connection to the CPG service
 .SH SYNOPSIS

man/cpg_join.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_JOIN 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_JOIN 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_join \- Joins one or more groups in the CPG library
 .SH SYNOPSIS

man/cpg_leave.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_LEAVE 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_LEAVE 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_leave \- Leave a group in the CPG library
 .SH SYNOPSIS

man/cpg_local_get.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_LOCAL_GET 3 2007-06-12 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_LOCAL_GET 3 2007-06-12 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_local_get \- Returns the local processor id
 .SH SYNOPSIS

man/cpg_mcast_joined.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_MCAST_JOINED 3 3004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_MCAST_JOINED 3 3004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_mcast_joined \- Multicasts to all groups joined to a handle
 .SH SYNOPSIS

man/cpg_membership_get.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_MEMBERSHIP_GET 3 2006-02-06 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_MEMBERSHIP_GET 3 2006-02-06 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 cpg_membership_get \- Returns a list of members of a CPG library group
 .SH SYNOPSIS

man/cpg_overview.8

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH CPG_OVERVIEW 8 2006-03-06 "corosync Man Page" "Openais Programmer's Manual"
+.TH CPG_OVERVIEW 8 2006-03-06 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH OVERVIEW
 The CPG library is delivered with the corosync project.  This library is used
 to create distributed applications that operate properly during partitions, merges,

man/evs_dispatch.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_DISPATCH 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_DISPATCH 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_dispatch \- Dispatches callbacks from the EVS service
 .SH SYNOPSIS

man/evs_fd_get.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_FD_GET 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_FD_GET 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_fd_get \- Dispatches callbacks from the EVS service
 .SH SYNOPSIS

man/evs_finalize.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_FINALIZE 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_FINALIZE 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_finalize \- Terminate a connection to the EVS service
 .SH SYNOPSIS

man/evs_initialize.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_INITIALIZE 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_INITIALIZE 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_initialize \- Create a new connection to the EVS service
 .SH SYNOPSIS

man/evs_join.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_JOIN 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_JOIN 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_join \- Joins one or more groups in the EVS library
 .SH SYNOPSIS

man/evs_leave.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_LEAVE 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_LEAVE 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_leave \- Leave one or more groups in the EVS library
 .SH SYNOPSIS

man/evs_mcast_groups.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_MCAST_GROUPS 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_MCAST_GROUPS 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_join \- Multicast a message to selected groups
 .SH SYNOPSIS

man/evs_mcast_joined.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_MCAST_JOINED 3 3004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_MCAST_JOINED 3 3004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_join \- Multicasts to all groups joined to an handle
 .SH SYNOPSIS

man/evs_membership_get.3

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_JOIN 3 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_JOIN 3 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH NAME
 evs_join \- Joins one or more groups in the EVS library
 .SH SYNOPSIS

man/evs_overview.8

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH EVS_OVERVIEW 8 2004-08-31 "corosync Man Page" "Openais Programmer's Manual"
+.TH EVS_OVERVIEW 8 2004-08-31 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH OVERVIEW
 The EVS library is delivered with the corosync project.  This library is used
 to create distributed applications that operate properly during partitions, merges,

man/logsys_overview.8

@@ -31,7 +31,7 @@
 .\" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
 .\" * THE POSSIBILITY OF SUCH DAMAGE.
 .\" */
-.TH LOGSYS_OVERVIEW 8 2007-05-15 "corosync Man Page" "Openais Programmer's Manual"
+.TH LOGSYS_OVERVIEW 8 2007-05-15 "corosync Man Page" "Corosync Cluster Engine Programmer's Manual"
 .SH OVERVIEW
 The logsys library provides a generically usable logging and tracing system for
 use by applications.  It supports many features including:

services/Makefile

@@ -41,11 +41,11 @@ ifeq (${BUILD_DYNAMIC}, 1)
 	override LDFLAGS += ${DYFLAGS}
 endif
 
-ifeq (${OPENAIS_COMPAT}, LINUX) 
+ifeq (${COROSYNC_COMPAT}, LINUX) 
 	override LDFLAGS += -ldl
 endif
 
-ifeq (${OPENAIS_COMPAT}, SOLARIS) 
+ifeq (${COROSYNC_COMPAT}, SOLARIS) 
 	override LDFLAGS += -lnsl -lsocket -lrt
 endif
 
@@ -57,7 +57,7 @@ override CFLAGS += -fPIC
 
 all: service_evs.lcrso service_cfg.lcrso service_cpg.lcrso service_confdb.lcrso
 
-ifeq (${OPENAIS_COMPAT}, DARWIN)
+ifeq (${COROSYNC_COMPAT}, DARWIN)
 
 service_evs.lcrso: evs.o
 	$(CC) $(LDFLAGS) -bundle $(LDFLAGS) -bundle_loader ../exec/corosync -bind_at_load evs.o -o $@

services/cpg.c

@@ -31,7 +31,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-#ifndef OPENAIS_BSD
+#ifndef COROSYNC_BSD
 #include <alloca.h>
 #endif
 #include <sys/types.h>

test/Makefile

@@ -33,7 +33,7 @@
 #
 include ../Makefile.inc
 
-ifeq (${OPENAIS_COMPAT}, SOLARIS)
+ifeq (${COROSYNC_COMPAT}, SOLARIS)
 	override LDFLAGS += -lnsl -lsocket -lrt
 endif
 

test/cpgbench.c

@@ -53,7 +53,7 @@
 #include <corosync/saAis.h>
 #include <corosync/cpg.h>
 
-#ifdef OPENAIS_SOLARIS
+#ifdef COROSYNC_SOLARIS
 #define timersub(a, b, result)						\
     do {								\
 	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			\

test/evsbench.c

@@ -52,7 +52,7 @@
 #include <corosync/saAis.h>
 #include <corosync/evs.h>
 
-#ifdef OPENAIS_SOLARIS
+#ifdef COROSYNC_SOLARIS
 #define timersub(a, b, result)						\
     do {								\
 	(result)->tv_sec = (a)->tv_sec - (b)->tv_sec;			\

tools/Makefile

@@ -37,7 +37,7 @@ subdir ?= apps/
 
 include $(srcdir)Makefile.inc
 
-ifeq (${OPENAIS_COMPAT}, SOLARIS)
+ifeq (${COROSYNC_COMPAT}, SOLARIS)
 	override LDFLAGS += -lnsl -lsocket -lrt
 endif
 

tools/corosync-keygen.c

@@ -46,7 +46,7 @@ int main (void) {
 	unsigned char key[128];
 	int res;
 	
-	printf ("OpenAIS Authentication key generator.\n");
+	printf ("Corosync Cluster Engine Authentication key generator.\n");
 	if (geteuid() != 0) {
 		printf ("Error: Authorization key must be generated as root user.\n");
 		exit (1);