fidencio's pull request #10: "UTIL: Remove support to libini older than 1.0.0"
was synchronize
See the full pull-request at https://github.com/SSSD/sssd/pull/10
... or pull the PR as Git branch:
git remote add ghsssd https://github.com/SSSD/sssd
git fetch ghsssd pull/10/head:pr10
git checkout pr10
From 331a48c171d3d8817f3b5871326dfd67ed94b2db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fiden...@redhat.com>
Date: Wed, 31 Aug 2016 16:25:20 +0200
Subject: [PATCH] UTIL: Remove support to libini older than 1.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
libini 1.0.0 is part of ding-libs 0.3.0 and has been around since 2013.
Even the old systems that we have to support already have a newer
version of the library. RHEL6, for instance, has ding-libs 0.4.0 which
provides libini 1.1.0.
By removing this code we also can stop depending on libcollection.
Signed-off-by: Fabiano Fidêncio <fiden...@redhat.com>
---
configure.ac | 1 -
contrib/ci/deps.sh | 1 -
contrib/sssd.spec.in | 1 -
src/external/libcollection.m4 | 9 ----
src/util/sss_ini.c | 97 -------------------------------------------
5 files changed, 109 deletions(-)
delete mode 100644 src/external/libcollection.m4
diff --git a/configure.ac b/configure.ac
index 8760a85..f6c970d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -158,7 +158,6 @@ m4_include([src/external/libtdb.m4])
m4_include([src/external/libtevent.m4])
m4_include([src/external/libldb.m4])
m4_include([src/external/libdhash.m4])
-m4_include([src/external/libcollection.m4])
m4_include([src/external/libini_config.m4])
m4_include([src/external/pam.m4])
m4_include([src/external/ldap.m4])
diff --git a/contrib/ci/deps.sh b/contrib/ci/deps.sh
index 1a94e3d..41e5d56 100644
--- a/contrib/ci/deps.sh
+++ b/contrib/ci/deps.sh
@@ -71,7 +71,6 @@ if [[ "$DISTRO_BRANCH" == -debian-* ]]; then
libaugeas-dev
libc-ares-dev
libcmocka-dev
- libcollection-dev
libdbus-1-dev
libdhash-dev
libglib2.0-dev
diff --git a/contrib/sssd.spec.in b/contrib/sssd.spec.in
index 1f79ca7..078a725 100644
--- a/contrib/sssd.spec.in
+++ b/contrib/sssd.spec.in
@@ -120,7 +120,6 @@ BuildRequires: libtevent-devel
BuildRequires: libtdb-devel
BuildRequires: libldb-devel
BuildRequires: libdhash-devel >= 0.4.2
-BuildRequires: libcollection-devel
BuildRequires: libini_config-devel >= 1.1
BuildRequires: dbus-devel
BuildRequires: dbus-libs
diff --git a/src/external/libcollection.m4 b/src/external/libcollection.m4
deleted file mode 100644
index 0f737c1..0000000
--- a/src/external/libcollection.m4
+++ /dev/null
@@ -1,9 +0,0 @@
-AC_SUBST(COLLECTION_CFLAGS)
-AC_SUBST(COLLECTION_LIBS)
-
-PKG_CHECK_MODULES(COLLECTION,
- collection >= 0.5.1,
- ,
- AC_MSG_ERROR("Please install libcollection-devel")
- )
-
diff --git a/src/util/sss_ini.c b/src/util/sss_ini.c
index e56006c..5b90040 100644
--- a/src/util/sss_ini.c
+++ b/src/util/sss_ini.c
@@ -32,18 +32,10 @@
#include "confdb/confdb_setup.h"
#include "confdb/confdb_private.h"
-#ifdef HAVE_LIBINI_CONFIG_V1
#include "ini_configobj.h"
-#else
-#include "collection.h"
-#include "collection_tools.h"
-#endif
-
#include "ini_config.h"
-#ifdef HAVE_LIBINI_CONFIG_V1
-
struct sss_ini_initdata {
char **error_list;
struct ref_array *ra_success_list;
@@ -59,24 +51,6 @@ struct sss_ini_initdata {
#define sss_ini_get_const_string_config_value ini_get_const_string_config_value
#define sss_ini_get_config_obj ini_get_config_valueobj
-#else
-
-struct sss_ini_initdata {
- struct collection_item *error_list;
- struct collection_item *sssd_config;
- struct collection_item *obj;
- struct stat cstat;
- int file;
-};
-
-#define sss_ini_get_sec_list get_section_list
-#define sss_ini_get_attr_list get_attribute_list
-#define sss_ini_get_const_string_config_value get_const_string_config_value
-#define sss_ini_get_config_obj(secs,attrs,cfg,flag,attr) \
- get_config_item(secs,attrs,cfg,attr)
-
-#endif
-
/* Initialize data structure */
@@ -92,17 +66,10 @@ struct sss_ini_initdata* sss_ini_initdata_init(TALLOC_CTX *mem_ctx)
void sss_ini_close_file(struct sss_ini_initdata *init_data)
{
if (init_data == NULL) return;
-#ifdef HAVE_LIBINI_CONFIG_V1
if (init_data->file != NULL) {
ini_config_file_destroy(init_data->file);
init_data->file = NULL;
}
-#else
- if (init_data->file != -1) {
- close(init_data->file);
- init_data->file = -1;
- }
-#endif
}
@@ -112,15 +79,9 @@ void sss_ini_close_file(struct sss_ini_initdata *init_data)
int sss_ini_config_file_open(struct sss_ini_initdata *init_data,
const char *config_file)
{
-#ifdef HAVE_LIBINI_CONFIG_V1
return ini_config_file_open(config_file,
INI_META_STATS,
&init_data->file);
-#else
- return check_and_open_readonly(config_file, &init_data->file, 0, 0,
- S_IFREG|S_IRUSR, /* f r**------ */
- S_IFMT|(ALLPERMS & ~(S_IWUSR|S_IXUSR)));
-#endif
}
@@ -129,7 +90,6 @@ int sss_ini_config_file_open(struct sss_ini_initdata *init_data,
int sss_ini_config_access_check(struct sss_ini_initdata *init_data)
{
-#ifdef HAVE_LIBINI_CONFIG_V1
return ini_config_access_check(init_data->file,
INI_ACCESS_CHECK_MODE |
INI_ACCESS_CHECK_UID |
@@ -138,9 +98,6 @@ int sss_ini_config_access_check(struct sss_ini_initdata *init_data)
0, /* owned by root */
S_IRUSR, /* r**------ */
ALLPERMS & ~(S_IWUSR|S_IXUSR));
-#else
- return EOK;
-#endif
}
@@ -149,16 +106,11 @@ int sss_ini_config_access_check(struct sss_ini_initdata *init_data)
int sss_ini_get_stat(struct sss_ini_initdata *init_data)
{
-#ifdef HAVE_LIBINI_CONFIG_V1
init_data->cstat = ini_config_get_stat(init_data->file);
if (!init_data->cstat) return EIO;
return EOK;
-#else
-
- return fstat(init_data->file, &init_data->cstat);
-#endif
}
@@ -169,13 +121,8 @@ int sss_ini_get_mtime(struct sss_ini_initdata *init_data,
size_t timestr_len,
char *timestr)
{
-#ifdef HAVE_LIBINI_CONFIG_V1
return snprintf(timestr, timestr_len, "%llu",
(long long unsigned)init_data->cstat->st_mtime);
-#else
- return snprintf(timestr, timestr_len, "%llu",
- (long long unsigned)init_data->cstat.st_mtime);
-#endif
}
@@ -184,7 +131,6 @@ int sss_ini_get_mtime(struct sss_ini_initdata *init_data,
static void sss_ini_config_print_errors(char **error_list)
{
-#ifdef HAVE_LIBINI_CONFIG_V1
unsigned count = 0;
if (!error_list) {
@@ -195,9 +141,6 @@ static void sss_ini_config_print_errors(char **error_list)
DEBUG(SSSDBG_FATAL_FAILURE, "%s\n", error_list[count]);
count++;
}
-#endif
-
- return;
}
@@ -209,7 +152,6 @@ int sss_ini_get_config(struct sss_ini_initdata *init_data,
const char *config_dir)
{
int ret;
-#ifdef HAVE_LIBINI_CONFIG_V1
#ifdef HAVE_LIBINI_CONFIG_V1_3
const char *patterns[] = { "^[^\\.].*\\.conf$", NULL };
const char *sections[] = { ".*", NULL };
@@ -303,33 +245,6 @@ int sss_ini_get_config(struct sss_ini_initdata *init_data,
#endif
return ret;
-
-#else
-
- /* Read the configuration into a collection */
- ret = config_from_fd("sssd",
- init_data->file,
- config_file,
- &init_data->sssd_config,
- INI_STOP_ON_ANY,
- &init_data->error_list);
-
- if (ret != EOK) {
- DEBUG(SSSDBG_FATAL_FAILURE,
- "Parse error reading configuration file [%s]\n",
- config_file);
-
- print_file_parsing_errors(stderr, init_data->error_list);
-
- free_ini_config_errors(init_data->error_list);
- free_ini_config(init_data->sssd_config);
-
- return ret;
- }
-
- return EOK;
-
-#endif
}
struct ref_array *
@@ -379,11 +294,7 @@ int sss_ini_check_config_obj(struct sss_ini_initdata *init_data)
int sss_ini_get_int_config_value(struct sss_ini_initdata *init_data,
int strict, int def, int *error)
{
-#ifdef HAVE_LIBINI_CONFIG_V1
return ini_get_int_config_value(init_data->obj, strict, def, error);
-#else
- return get_int_config_value(init_data->obj, strict, def, error);
-#endif
}
@@ -393,14 +304,10 @@ int sss_ini_get_int_config_value(struct sss_ini_initdata *init_data,
void sss_ini_config_destroy(struct sss_ini_initdata *init_data)
{
if (init_data == NULL) return;
-#ifdef HAVE_LIBINI_CONFIG_V1
if (init_data->sssd_config != NULL) {
ini_config_destroy(init_data->sssd_config);
init_data->sssd_config = NULL;
}
-#else
- free_ini_config(init_data->sssd_config);
-#endif
}
@@ -426,11 +333,7 @@ int sss_confdb_create_ldif(TALLOC_CTX *mem_ctx,
size_t dn_size;
size_t ldif_len;
size_t attr_len;
-#ifdef HAVE_LIBINI_CONFIG_V1
struct value_obj *obj = NULL;
-#else
- struct collection_item *obj = NULL;
-#endif
ldif_len = strlen(CONFDB_INTERNAL_LDIF);
ldif = talloc_array(mem_ctx, char, ldif_len+1);
_______________________________________________
sssd-devel mailing list
sssd-devel@lists.fedorahosted.org
https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
