From 28397cae4102ac3f08576ebaf071ad92683097e8 Mon Sep 17 00:00:00 2001 From: Emmanuel Dreyfus Date: Thu, 2 Apr 2015 15:51:30 +0200 Subject: 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 Reviewed-on: http://review.gluster.org/10017 Tested-by: Gluster Build System Reviewed-by: Niels de Vos --- libglusterfs/src/gfdb/gfdb_data_store_types.h | 2 +- libglusterfs/src/gfdb/gfdb_sqlite3_helper.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'libglusterfs/src/gfdb') diff --git a/libglusterfs/src/gfdb/gfdb_data_store_types.h b/libglusterfs/src/gfdb/gfdb_data_store_types.h index e3a2c76435b..4dd1584b6cd 100644 --- a/libglusterfs/src/gfdb/gfdb_data_store_types.h +++ b/libglusterfs/src/gfdb/gfdb_data_store_types.h @@ -414,7 +414,7 @@ str_to_link_info (char *str_link, token_str = strtok_r(str_link, delimiter, &saveptr); if (token_str != NULL) { strcpy (gfid, token_str); - ret = uuid_parse (gfid, link_info->pargfid); + ret = gf_uuid_parse (gfid, link_info->pargfid); if (ret == -1) goto out; } diff --git a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c index 50504181d26..14aec204917 100644 --- a/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c +++ b/libglusterfs/src/gfdb/gfdb_sqlite3_helper.c @@ -1051,7 +1051,7 @@ gf_sql_query_function (sqlite3_stmt *prep_stmt, "Failed retriving GF_ID"); goto out; } - ret = uuid_parse (text_column, gfdb_query_record->gfid); + ret = gf_uuid_parse (text_column, gfdb_query_record->gfid); if (ret) { gf_log (GFDB_STR_SQLITE3, GF_LOG_ERROR, "Failed parsing GF_ID"); -- cgit