From a473fb88e6015cf0ccbd2e9005c7e6acca18f452 Mon Sep 17 00:00:00 2001 From: Pavel Březina Date: Mon, 2 Sep 2013 13:36:25 +0200 Subject: util: add sss_idmap_talloc[_free] Remove code duplication. --- Makefile.am | 4 +++- src/providers/ad/ad_subdomains.c | 14 +++----------- src/providers/ipa/ipa_idmap.c | 17 +++-------------- src/providers/ldap/sdap_idmap.c | 17 +++-------------- src/responder/nss/nsssrv.c | 13 ++----------- src/responder/pac/pacsrv.c | 13 ++----------- src/util/util_sss_idmap.c | 32 ++++++++++++++++++++++++++++++++ src/util/util_sss_idmap.h | 28 ++++++++++++++++++++++++++++ 8 files changed, 76 insertions(+), 62 deletions(-) create mode 100644 src/util/util_sss_idmap.c create mode 100644 src/util/util_sss_idmap.h diff --git a/Makefile.am b/Makefile.am index 610f1499..5aba7603 100644 --- a/Makefile.am +++ b/Makefile.am @@ -407,6 +407,7 @@ dist_noinst_HEADERS = \ src/util/auth_utils.h \ src/util/authtok.h \ src/util/util_safealign.h \ + src/util/util_sss_idmap.h \ src/monitor/monitor.h \ src/monitor/monitor_interfaces.h \ src/responder/common/responder.h \ @@ -571,7 +572,8 @@ libsss_util_la_SOURCES = \ src/util/util_lock.c \ src/util/util_errors.c \ src/util/sss_ini.c \ - src/util/io.c + src/util/io.c \ + src/util/util_sss_idmap.c libsss_util_la_LIBADD = \ $(SSSD_LIBS) \ $(UNICODE_LIBS) diff --git a/src/providers/ad/ad_subdomains.c b/src/providers/ad/ad_subdomains.c index afd2031f..87685088 100644 --- a/src/providers/ad/ad_subdomains.c +++ b/src/providers/ad/ad_subdomains.c @@ -24,6 +24,7 @@ #include "providers/ldap/sdap_async.h" #include "providers/ad/ad_subdomains.h" +#include "util/util_sss_idmap.h" #include #include #include @@ -777,16 +778,6 @@ struct bet_ops ad_subdomains_ops = { .finalize = NULL }; -static void *idmap_talloc(size_t size, void *pvt) -{ - return talloc_size(pvt, size); -} - -static void idmap_free(void *ptr, void *pvt) -{ - talloc_free(ptr); -} - int ad_subdom_init(struct be_ctx *be_ctx, struct ad_id_ctx *id_ctx, const char *ad_domain, @@ -825,7 +816,8 @@ int ad_subdom_init(struct be_ctx *be_ctx, DEBUG(SSSDBG_MINOR_FAILURE, ("Failed to add subdom offline callback")); } - err = sss_idmap_init(idmap_talloc, ctx, idmap_free, &ctx->idmap_ctx); + err = sss_idmap_init(sss_idmap_talloc, ctx, sss_idmap_talloc_free, + &ctx->idmap_ctx); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, ("Failed to initialize idmap context.\n")); return EFAULT; diff --git a/src/providers/ipa/ipa_idmap.c b/src/providers/ipa/ipa_idmap.c index 69ab55c9..2f141f8e 100644 --- a/src/providers/ipa/ipa_idmap.c +++ b/src/providers/ipa/ipa_idmap.c @@ -24,18 +24,7 @@ #include "util/util.h" #include "providers/ldap/sdap_idmap.h" #include "providers/ipa/ipa_common.h" - -static void * -ipa_idmap_talloc(size_t size, void *pvt) -{ - return talloc_size(pvt, size); -} - -static void -ipa_idmap_talloc_free(void *ptr, void *pvt) -{ - talloc_free(ptr); -} +#include "util/util_sss_idmap.h" errno_t ipa_idmap_find_new_domain(struct sdap_idmap_ctx *idmap_ctx, const char *dom_name, @@ -168,8 +157,8 @@ errno_t ipa_idmap_init(TALLOC_CTX *mem_ctx, idmap_ctx->find_new_domain = ipa_idmap_find_new_domain; /* Initialize the map */ - err = sss_idmap_init(ipa_idmap_talloc, idmap_ctx, - ipa_idmap_talloc_free, + err = sss_idmap_init(sss_idmap_talloc, idmap_ctx, + sss_idmap_talloc_free, &idmap_ctx->map); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, diff --git a/src/providers/ldap/sdap_idmap.c b/src/providers/ldap/sdap_idmap.c index 7a727719..667e3774 100644 --- a/src/providers/ldap/sdap_idmap.c +++ b/src/providers/ldap/sdap_idmap.c @@ -24,18 +24,7 @@ #include "util/dlinklist.h" #include "util/murmurhash3.h" #include "providers/ldap/sdap_idmap.h" - -static void * -sdap_idmap_talloc(size_t size, void *pvt) -{ - return talloc_size(pvt, size); -} - -static void -sdap_idmap_talloc_free(void *ptr, void *pvt) -{ - talloc_free(ptr); -} +#include "util/util_sss_idmap.h" static errno_t sdap_idmap_add_configured_external_range(struct sdap_idmap_ctx *idmap_ctx) @@ -173,8 +162,8 @@ sdap_idmap_init(TALLOC_CTX *mem_ctx, } /* Initialize the map */ - err = sss_idmap_init(sdap_idmap_talloc, idmap_ctx, - sdap_idmap_talloc_free, + err = sss_idmap_init(sss_idmap_talloc, idmap_ctx, + sss_idmap_talloc_free, &idmap_ctx->map); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_CRIT_FAILURE, diff --git a/src/responder/nss/nsssrv.c b/src/responder/nss/nsssrv.c index 253756d1..5f1d2e67 100644 --- a/src/responder/nss/nsssrv.c +++ b/src/responder/nss/nsssrv.c @@ -47,6 +47,7 @@ #include "providers/data_provider.h" #include "monitor/monitor_interfaces.h" #include "sbus/sbus_client.h" +#include "util/util_sss_idmap.h" #define DEFAULT_PWFIELD "*" #define DEFAULT_NSS_FD_LIMIT 8192 @@ -413,16 +414,6 @@ static void nss_dp_reconnect_init(struct sbus_connection *conn, /* nss_shutdown(rctx); */ } -static void *idmap_talloc(size_t size, void *pvt) -{ - return talloc_size(pvt, size); -} - -static void idmap_free(void *ptr, void *pvt) -{ - talloc_free(ptr); -} - int nss_process_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct confdb_ctx *cdb) @@ -490,7 +481,7 @@ int nss_process_init(TALLOC_CTX *mem_ctx, nss_dp_reconnect_init, iter); } - err = sss_idmap_init(idmap_talloc, nctx, idmap_free, + err = sss_idmap_init(sss_idmap_talloc, nctx, sss_idmap_talloc_free, &nctx->idmap_ctx); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_FATAL_FAILURE, ("sss_idmap_init failed.\n")); diff --git a/src/responder/pac/pacsrv.c b/src/responder/pac/pacsrv.c index 22f87cb7..a06d768b 100644 --- a/src/responder/pac/pacsrv.c +++ b/src/responder/pac/pacsrv.c @@ -42,6 +42,7 @@ #include "providers/data_provider.h" #include "monitor/monitor_interfaces.h" #include "sbus/sbus_client.h" +#include "util/util_sss_idmap.h" #define SSS_PAC_PIPE_NAME "pac" #define DEFAULT_PAC_FD_LIMIT 8192 @@ -105,16 +106,6 @@ static void pac_dp_reconnect_init(struct sbus_connection *conn, /* nss_shutdown(rctx); */ } -static void *idmap_talloc(size_t size, void *pvt) -{ - return talloc_size(pvt, size); -} - -static void idmap_free(void *ptr, void *pvt) -{ - talloc_free(ptr); -} - int pac_process_init(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct confdb_ctx *cdb) @@ -186,7 +177,7 @@ int pac_process_init(TALLOC_CTX *mem_ctx, pac_dp_reconnect_init, iter); } - err = sss_idmap_init(idmap_talloc, pac_ctx, idmap_free, + err = sss_idmap_init(sss_idmap_talloc, pac_ctx, sss_idmap_talloc_free, &pac_ctx->idmap_ctx); if (err != IDMAP_SUCCESS) { DEBUG(SSSDBG_FATAL_FAILURE, ("sss_idmap_init failed.\n")); diff --git a/src/util/util_sss_idmap.c b/src/util/util_sss_idmap.c new file mode 100644 index 00000000..4ce42507 --- /dev/null +++ b/src/util/util_sss_idmap.c @@ -0,0 +1,32 @@ +/* + Authors: + Pavel Březina + + Copyright (C) 2013 Red Hat + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include +#include "util/util_sss_idmap.h" + +void *sss_idmap_talloc(size_t size, void *pvt) +{ + return talloc_size(pvt, size); +} + +void sss_idmap_talloc_free(void *ptr, void *pvt) +{ + talloc_free(ptr); +} diff --git a/src/util/util_sss_idmap.h b/src/util/util_sss_idmap.h new file mode 100644 index 00000000..bde47271 --- /dev/null +++ b/src/util/util_sss_idmap.h @@ -0,0 +1,28 @@ +/* + Authors: + Pavel Březina + + Copyright (C) 2013 Red Hat + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __UTIL_SSS_IDMAP_H__ +#define __UTIL_SSS_IDMAP_H__ + +void *sss_idmap_talloc(size_t size, void *pvt); + +void sss_idmap_talloc_free(void *ptr, void *pvt); + +#endif /* __UTIL_SSS_IDMAP_H__ */ -- cgit