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, 3 insertions, 3 deletions

diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index 94e660795db..67a3e6d6c29 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -298,7 +298,7 @@ out:
                 gf_log (frame->this->name, GF_LOG_DEBUG,
                         "Volume Id: %s", volume_id_str);
                 pthread_mutex_lock (&fs->mutex);
-                uuid_parse (volume_id_str, fs->vol_uuid);
+                gf_uuid_parse (volume_id_str, fs->vol_uuid);
                 pthread_mutex_unlock (&fs->mutex);
         }
 
@@ -333,7 +333,7 @@ pub_glfs_get_volumeid (struct glfs *fs, char *volid, size_t size)
         pthread_mutex_lock (&fs->mutex);
         {
                 /* check if the volume uuid is initialized */
-                if (!uuid_is_null (fs->vol_uuid)) {
+                if (!gf_uuid_is_null (fs->vol_uuid)) {
                         pthread_mutex_unlock (&fs->mutex);
                         goto done;
                 }
@@ -343,7 +343,7 @@ pub_glfs_get_volumeid (struct glfs *fs, char *volid, size_t size)
         /* Need to fetch volume_uuid */
         glfs_get_volume_info (fs);
 
-        if (uuid_is_null (fs->vol_uuid)) {
+        if (gf_uuid_is_null (fs->vol_uuid)) {
                 gf_log (THIS->name, GF_LOG_ERROR, "Unable to fetch volume UUID");
                 return -1;
         }