Avoid conflict between contrib/uuid and system uuid

glusterfs relies on Linux uuid implementation, which
API is incompatible with most other systems's uuid. As
a result, libglusterfs has to embed contrib/uuid,
which is the Linux implementation, on non Linux systems.
This implementation is incompatible with systtem's
built in, but the symbols have the same names.

Usually this is not a problem because when we link
with -lglusterfs, libc's symbols are trumped. However
there is a problem when a program not linked with
-lglusterfs will dlopen() glusterfs component. In
such a case, libc's uuid implementation is already
loaded in the calling program, and it will be used
instead of libglusterfs's implementation, causing
crashes.

A possible workaround is to use pre-load libglusterfs
in the calling program (using LD_PRELOAD on NetBSD for
instance), but such a mechanism is not portable, nor
is it flexible. A much better approach is to rename
libglusterfs's uuid_* functions to gf_uuid_* to avoid
any possible conflict. This is what this change attempts.

BUG: 1206587
Change-Id: I9ccd3e13afed1c7fc18508e92c7beb0f5d49f31a
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/10017
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/xlators/mgmt/glusterd/src/glusterd-handshake.c b/xlators/mgmt/glusterd/src/glusterd-handshake.c
index ddb1403b391..850427714c0 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handshake.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handshake.c
@@ -433,7 +433,7 @@ glusterd_create_missed_snap (glusterd_missed_snap_info *missed_snapinfo,
         GF_ASSERT (missed_snapinfo);
         GF_ASSERT (snap_opinfo);
 
-        uuid_parse (missed_snapinfo->snap_uuid, snap_uuid);
+        gf_uuid_parse (missed_snapinfo->snap_uuid, snap_uuid);
 
         /* Find the snap-object */
         snap = glusterd_find_snap_by_id (snap_uuid);
@@ -1521,7 +1521,7 @@ glusterd_event_connected_inject (glusterd_peerctx_t *peerctx)
         ctx->dict = peerctx->args.dict;
 
         event->peername = gf_strdup (peerinfo->hostname);
-        uuid_copy (event->peerid, peerinfo->uuid);
+        gf_uuid_copy (event->peerid, peerinfo->uuid);
         event->ctx = ctx;
 
         ret = glusterd_friend_sm_inject_event (event);