[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: ehlo, The main reason for these patch was to improve recently added logging to hbac. Side effect of these change is improvement for libldb and libsemanage (6th patch) 4th patch is not API/ABI change because such version has not beeen released yet. If you do not like change in hbac callback hbac_debug_fn_t then we should also remove because it is too internal then we should remove also the first two arguments. "file", "line" also leaks internal data from libhbac. Removing the first two arguments would be almost consistent callbacks in libldb and libsemanage. LS Hi, I'm getting following errors: In file included from /home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: /home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: "SSS_ATTRIBUTE_PRINTF" redefined [-Werror] #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, a2))) ^ In file included from /home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: /home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the location of the previous definition #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, a2))) ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On (15/01/16 12:03), Pavel Březina wrote: >On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: >>ehlo, >> >>The main reason for these patch was to improve >>recently added logging to hbac. >> >>Side effect of these change is improvement for libldb >>and libsemanage (6th patch) >> >>4th patch is not API/ABI change because >>such version has not beeen released yet. >>If you do not like change in hbac callback >>hbac_debug_fn_t then we should also remove >>because it is too internal then we should >>remove also the first two arguments. >>"file", "line" also leaks internal data from libhbac. >>Removing the first two arguments would be almost >>consistent callbacks in libldb and libsemanage. >> >>LS > >Hi, >I'm getting following errors: > >In file included from /home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: >/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: >"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] > #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, a2))) > ^ >In file included from /home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: >/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the >location of the previous definition > #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, >a2))) > I might add another #ifdef guard but I decided to rename macro SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF LS >From f3c9ba96e6d3df572c48d18c8cad05edaccc8d00 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Mon, 11 Jan 2016 18:54:40 +0100 Subject: [PATCH 1/6] UTIL: Use prefix for debug function --- src/providers/ipa/ipa_access.c | 4 ++-- src/util/debug.c | 12 ++-- src/util/sss_semanage.c| 2 +- src/util/util.h| 16 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/providers/ipa/ipa_access.c b/src/providers/ipa/ipa_access.c index 65a791c3fe4b56d0f50d6e501a69d6d4b13f1d9a..e6028ed8f50f524bd837ec9341773f88aa2a5a2b 100644 --- a/src/providers/ipa/ipa_access.c +++ b/src/providers/ipa/ipa_access.c @@ -77,8 +77,8 @@ void hbac_debug_messages(const char *file, int line, return; } -debug_fn(__FILE__, __LINE__, "hbac", loglevel, "[%s:%i] %s", - file, line, message); +sss_debug_fn(__FILE__, __LINE__, "hbac", loglevel, "[%s:%i] %s", + file, line, message); free(message); } } diff --git a/src/util/debug.c b/src/util/debug.c index a8eea32740155ec3daf6be71ef9a8af6592f74a9..c0a7732e90a1727f7c9514ad7ee6daf426b6075b 100644 --- a/src/util/debug.c +++ b/src/util/debug.c @@ -206,11 +206,11 @@ journal_done: } #endif /* WiTH_JOURNALD */ -void debug_fn(const char *file, - long line, - const char *function, - int level, - const char *format, ...) +void sss_debug_fn(const char *file, + long line, + const char *function, + int level, + const char *format, ...) { va_list ap; struct timeval tv; @@ -301,7 +301,7 @@ void ldb_debug_messages(void *context, enum ldb_debug_level level, } if (DEBUG_IS_SET(loglevel)) -debug_fn(__FILE__, __LINE__, "ldb", loglevel, "%s\n", message); +sss_debug_fn(__FILE__, __LINE__, "ldb", loglevel, "%s\n", message); free(message); } diff --git a/src/util/sss_semanage.c b/src/util/sss_semanage.c index d1d03988c05dc011dbd465051d50fe6acca4f845..4fb9df589bbfddcc815ed321b6e3b32655d44a0c 100644 --- a/src/util/sss_semanage.c +++ b/src/util/sss_semanage.c @@ -64,7 +64,7 @@ static void sss_semanage_error_callback(void *varg, } if (DEBUG_IS_SET(level)) -debug_fn(__FILE__, __LINE__, "libsemanage", level, "%s\n", message); +sss_debug_fn(__FILE__, __LINE__, "libsemanage", level, "%s\n", message); free(message); } diff --git a/src/util/util.h b/src/util/util.h index e1245bb0fbab742dd58522f1892c66d08a45b59c..662d786ad362027e2f816688a02fd6fab36df14c 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -77,11 +77,11 @@ extern int debug_microseconds; extern int debug_to_file; extern int debug_to_stderr; extern const char *debug_log_file; -void debug_fn(const char *file, - long line, - const char *function, - int level, - const char *format, ...) SSS_ATTRIBUTE_PRINTF(5,6); +void sss_debug_fn(const char *file, + long line, + const char *function, + int level, + const char *format, ...) SSS_ATTRIBUTE_PRINTF(5, 6); int debug_convert_old_level(int old_level); errno_t set_debug_file_from_fd(const int fd); int get_fd_from_debug_file(void); @@ -135,9 +135,9 @@ int get_fd_from_debug_file(void); #define DEBUG(level, format, ...) do { \ int __debug_macro_level = level; \ if (DEBUG_IS_SET(__debug_macro_level)) { \ -debug_fn(__FILE__, __LINE
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On Fri, 2016-01-15 at 12:44 +0100, Lukas Slebodnik wrote: > On (15/01/16 12:03), Pavel Březina wrote: > >On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: > >>ehlo, > >> > >>The main reason for these patch was to improve > >>recently added logging to hbac. > >> > >>Side effect of these change is improvement for libldb > >>and libsemanage (6th patch) > >> > >>4th patch is not API/ABI change because > >>such version has not beeen released yet. > >>If you do not like change in hbac callback > >>hbac_debug_fn_t then we should also remove > >>because it is too internal then we should > >>remove also the first two arguments. > >>"file", "line" also leaks internal data from libhbac. > >>Removing the first two arguments would be almost > >>consistent callbacks in libldb and libsemanage. > >> > >>LS > > > >Hi, > >I'm getting following errors: > > > >In file included from /home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: > >/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: > >"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] > > #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, a2))) > > ^ > >In file included from /home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: > >/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the > >location of the previous definition > > #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, > >a2))) > > > I might add another #ifdef guard but I decided to rename macro > SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF Why is debug_fn being called directly in hbac/semanage/etc.. insted of being called through a common macro ? Simo. -- Simo Sorce * Red Hat, Inc * New York ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On (15/01/16 16:09), Simo Sorce wrote: >On Fri, 2016-01-15 at 12:44 +0100, Lukas Slebodnik wrote: >> On (15/01/16 12:03), Pavel Březina wrote: >> >On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: >> >>ehlo, >> >> >> >>The main reason for these patch was to improve >> >>recently added logging to hbac. >> >> >> >>Side effect of these change is improvement for libldb >> >>and libsemanage (6th patch) >> >> >> >>4th patch is not API/ABI change because >> >>such version has not beeen released yet. >> >>If you do not like change in hbac callback >> >>hbac_debug_fn_t then we should also remove >> >>because it is too internal then we should >> >>remove also the first two arguments. >> >>"file", "line" also leaks internal data from libhbac. >> >>Removing the first two arguments would be almost >> >>consistent callbacks in libldb and libsemanage. >> >> >> >>LS >> > >> >Hi, >> >I'm getting following errors: >> > >> >In file included from >> >/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: >> >/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: >> >"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] >> > #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, >> > a2))) >> > ^ >> >In file included from >> >/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: >> >/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the >> >location of the previous definition >> > #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, >> >a2))) >> > >> I might add another #ifdef guard but I decided to rename macro >> SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF > > >Why is debug_fn being called directly in hbac/semanage/etc.. insted of >being called through a common macro ? > libldb, libsemanage ... provide function which allows you to register your own debug function e.g. libldb has ldb_set_debug and we register ldb_debug_messages wih prototype void ldb_debug_messages(void *context, enum ldb_debug_level level, const char *fmt, va_list ap) However you cannot call DEBUG macro with agruments:"const char *fmt, va_list ap" So you need to call "vasprintf(&message, fmt, ap)" and then log message and then log message + release message; it is inefficient. The same situation is with libhbac and libsemanage. Does this answer your question? LS ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On Sat, 2016-01-16 at 12:33 +0100, Lukas Slebodnik wrote: > On (15/01/16 16:09), Simo Sorce wrote: > >On Fri, 2016-01-15 at 12:44 +0100, Lukas Slebodnik wrote: > >> On (15/01/16 12:03), Pavel Březina wrote: > >> >On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: > >> >>ehlo, > >> >> > >> >>The main reason for these patch was to improve > >> >>recently added logging to hbac. > >> >> > >> >>Side effect of these change is improvement for libldb > >> >>and libsemanage (6th patch) > >> >> > >> >>4th patch is not API/ABI change because > >> >>such version has not beeen released yet. > >> >>If you do not like change in hbac callback > >> >>hbac_debug_fn_t then we should also remove > >> >>because it is too internal then we should > >> >>remove also the first two arguments. > >> >>"file", "line" also leaks internal data from libhbac. > >> >>Removing the first two arguments would be almost > >> >>consistent callbacks in libldb and libsemanage. > >> >> > >> >>LS > >> > > >> >Hi, > >> >I'm getting following errors: > >> > > >> >In file included from > >> >/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: > >> >/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: > >> >"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] > >> > #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, > >> > a2))) > >> > ^ > >> >In file included from > >> >/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: > >> >/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the > >> >location of the previous definition > >> > #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, > >> >a2))) > >> > > >> I might add another #ifdef guard but I decided to rename macro > >> SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF > > > > > >Why is debug_fn being called directly in hbac/semanage/etc.. insted of > >being called through a common macro ? > > > libldb, libsemanage ... provide function which allows you to register > your own debug function > > e.g. > libldb has ldb_set_debug and we register ldb_debug_messages wih prototype >void ldb_debug_messages(void *context, enum ldb_debug_level level, >const char *fmt, va_list ap) > > However you cannot call DEBUG macro with agruments:"const char *fmt, va_list > ap" > So you need to call "vasprintf(&message, fmt, ap)" and then log message > and then log message + release message; it is inefficient. > > The same situation is with libhbac and libsemanage. > > Does this answer your question? Yes. -- Simo Sorce * Red Hat, Inc * New York ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On 01/15/2016 12:44 PM, Lukas Slebodnik wrote: On (15/01/16 12:03), Pavel Březina wrote: On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: ehlo, The main reason for these patch was to improve recently added logging to hbac. Side effect of these change is improvement for libldb and libsemanage (6th patch) 4th patch is not API/ABI change because such version has not beeen released yet. If you do not like change in hbac callback hbac_debug_fn_t then we should also remove because it is too internal then we should remove also the first two arguments. "file", "line" also leaks internal data from libhbac. Removing the first two arguments would be almost consistent callbacks in libldb and libsemanage. LS Hi, I'm getting following errors: In file included from /home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: /home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: "SSS_ATTRIBUTE_PRINTF" redefined [-Werror] #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, a2))) ^ In file included from /home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: /home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the location of the previous definition #define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, a2))) I might add another #ifdef guard but I decided to rename macro SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF Ack. ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On Fri, Feb 12, 2016 at 11:33:34AM +0100, Pavel Březina wrote: > On 01/15/2016 12:44 PM, Lukas Slebodnik wrote: > >On (15/01/16 12:03), Pavel Březina wrote: > >>On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: > >>>ehlo, > >>> > >>>The main reason for these patch was to improve > >>>recently added logging to hbac. > >>> > >>>Side effect of these change is improvement for libldb > >>>and libsemanage (6th patch) > >>> > >>>4th patch is not API/ABI change because > >>>such version has not beeen released yet. > >>>If you do not like change in hbac callback > >>>hbac_debug_fn_t then we should also remove > >>>because it is too internal then we should > >>>remove also the first two arguments. > >>>"file", "line" also leaks internal data from libhbac. > >>>Removing the first two arguments would be almost > >>>consistent callbacks in libldb and libsemanage. > >>> > >>>LS > >> > >>Hi, > >>I'm getting following errors: > >> > >>In file included from > >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: > >>/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: > >>"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] > >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, a2))) > >>^ > >>In file included from > >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: > >>/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the > >>location of the previous definition > >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, > >>a2))) > >> > >I might add another #ifdef guard but I decided to rename macro > >SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF > > > > Ack. CI: http://sssd-ci.duckdns.org/logs/job/37/61/summary.html Pushed to master: * f6c1f6a561bdd5b4bba03c02988a724da3dad387 * 21274963b575262b566115008119ef836c4db211 * d833f316243f4ccd52b9b53dbd6e91c784825479 * c426a8985a009e4506bef8dac76af4fa6fc2035c * 22bbd95a48d21452fa5bb1a96b43334503bf8132 * 2a44a8c6683cfea218ee5329bcfad953dfeb6746 It would be nice to push them also to sssd-1-13, since the patches are low-risk and omitting them might make backporting to sssd-1-13 harder later on, but the patches don't apply.. ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On (23/02/16 12:30), Jakub Hrozek wrote: >On Fri, Feb 12, 2016 at 11:33:34AM +0100, Pavel Březina wrote: >> On 01/15/2016 12:44 PM, Lukas Slebodnik wrote: >> >On (15/01/16 12:03), Pavel Březina wrote: >> >>On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: >> >>>ehlo, >> >>> >> >>>The main reason for these patch was to improve >> >>>recently added logging to hbac. >> >>> >> >>>Side effect of these change is improvement for libldb >> >>>and libsemanage (6th patch) >> >>> >> >>>4th patch is not API/ABI change because >> >>>such version has not beeen released yet. >> >>>If you do not like change in hbac callback >> >>>hbac_debug_fn_t then we should also remove >> >>>because it is too internal then we should >> >>>remove also the first two arguments. >> >>>"file", "line" also leaks internal data from libhbac. >> >>>Removing the first two arguments would be almost >> >>>consistent callbacks in libldb and libsemanage. >> >>> >> >>>LS >> >> >> >>Hi, >> >>I'm getting following errors: >> >> >> >>In file included from >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: >> >>/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: >> >>"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, >> >>a2))) >> >>^ >> >>In file included from >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: >> >>/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the >> >>location of the previous definition >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, >> >>a2))) >> >> >> >I might add another #ifdef guard but I decided to rename macro >> >SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF >> > >> >> Ack. > >CI: http://sssd-ci.duckdns.org/logs/job/37/61/summary.html > >Pushed to master: >* f6c1f6a561bdd5b4bba03c02988a724da3dad387 >* 21274963b575262b566115008119ef836c4db211 >* d833f316243f4ccd52b9b53dbd6e91c784825479 >* c426a8985a009e4506bef8dac76af4fa6fc2035c >* 22bbd95a48d21452fa5bb1a96b43334503bf8132 >* 2a44a8c6683cfea218ee5329bcfad953dfeb6746 > >It would be nice to push them also to sssd-1-13, since the patches are >low-risk and omitting them might make backporting to sssd-1-13 harder >later on, but the patches don't apply.. patches don't apply becuase hbac debug feature is not in 1.13. But I might prepare version without hbac debug feature. I also realized that new line will not be printed after ldb messages. So it might hapen that some debug messages will be on one line. Do we want to special case it? It's not problem with libipa_hbac becuase all debug messges there contain new line at the end of string. LS ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On Tue, Feb 23, 2016 at 12:41:04PM +0100, Lukas Slebodnik wrote: > On (23/02/16 12:30), Jakub Hrozek wrote: > >On Fri, Feb 12, 2016 at 11:33:34AM +0100, Pavel Březina wrote: > >> On 01/15/2016 12:44 PM, Lukas Slebodnik wrote: > >> >On (15/01/16 12:03), Pavel Březina wrote: > >> >>On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: > >> >>>ehlo, > >> >>> > >> >>>The main reason for these patch was to improve > >> >>>recently added logging to hbac. > >> >>> > >> >>>Side effect of these change is improvement for libldb > >> >>>and libsemanage (6th patch) > >> >>> > >> >>>4th patch is not API/ABI change because > >> >>>such version has not beeen released yet. > >> >>>If you do not like change in hbac callback > >> >>>hbac_debug_fn_t then we should also remove > >> >>>because it is too internal then we should > >> >>>remove also the first two arguments. > >> >>>"file", "line" also leaks internal data from libhbac. > >> >>>Removing the first two arguments would be almost > >> >>>consistent callbacks in libldb and libsemanage. > >> >>> > >> >>>LS > >> >> > >> >>Hi, > >> >>I'm getting following errors: > >> >> > >> >>In file included from > >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: > >> >>/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: > >> >>"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] > >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, > >> >>a2))) > >> >>^ > >> >>In file included from > >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: > >> >>/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the > >> >>location of the previous definition > >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, > >> >>a2))) > >> >> > >> >I might add another #ifdef guard but I decided to rename macro > >> >SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF > >> > > >> > >> Ack. > > > >CI: http://sssd-ci.duckdns.org/logs/job/37/61/summary.html > > > >Pushed to master: > >* f6c1f6a561bdd5b4bba03c02988a724da3dad387 > >* 21274963b575262b566115008119ef836c4db211 > >* d833f316243f4ccd52b9b53dbd6e91c784825479 > >* c426a8985a009e4506bef8dac76af4fa6fc2035c > >* 22bbd95a48d21452fa5bb1a96b43334503bf8132 > >* 2a44a8c6683cfea218ee5329bcfad953dfeb6746 > > > >It would be nice to push them also to sssd-1-13, since the patches are > >low-risk and omitting them might make backporting to sssd-1-13 harder > >later on, but the patches don't apply.. > patches don't apply becuase hbac debug feature is not in 1.13. > But I might prepare version without hbac debug feature. > > I also realized that new line will not be printed after ldb messages. I wonder if it was more systematic to wait until your samba patches are accepted? > So it might hapen that some debug messages will be on one line. > Do we want to special case it? > > It's not problem with libipa_hbac becuase all debug messges there > contain new line at the end of string. > > LS > ___ > sssd-devel mailing list > sssd-devel@lists.fedorahosted.org > https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On (23/02/16 13:15), Jakub Hrozek wrote: >On Tue, Feb 23, 2016 at 12:41:04PM +0100, Lukas Slebodnik wrote: >> On (23/02/16 12:30), Jakub Hrozek wrote: >> >On Fri, Feb 12, 2016 at 11:33:34AM +0100, Pavel Březina wrote: >> >> On 01/15/2016 12:44 PM, Lukas Slebodnik wrote: >> >> >On (15/01/16 12:03), Pavel Březina wrote: >> >> >>On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: >> >> >>>ehlo, >> >> >>> >> >> >>>The main reason for these patch was to improve >> >> >>>recently added logging to hbac. >> >> >>> >> >> >>>Side effect of these change is improvement for libldb >> >> >>>and libsemanage (6th patch) >> >> >>> >> >> >>>4th patch is not API/ABI change because >> >> >>>such version has not beeen released yet. >> >> >>>If you do not like change in hbac callback >> >> >>>hbac_debug_fn_t then we should also remove >> >> >>>because it is too internal then we should >> >> >>>remove also the first two arguments. >> >> >>>"file", "line" also leaks internal data from libhbac. >> >> >>>Removing the first two arguments would be almost >> >> >>>consistent callbacks in libldb and libsemanage. >> >> >>> >> >> >>>LS >> >> >> >> >> >>Hi, >> >> >>I'm getting following errors: >> >> >> >> >> >>In file included from >> >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: >> >> >>/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: error: >> >> >>"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] >> >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, a1, >> >> >>a2))) >> >> >>^ >> >> >>In file included from >> >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: >> >> >>/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the >> >> >>location of the previous definition >> >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, a1, >> >> >>a2))) >> >> >> >> >> >I might add another #ifdef guard but I decided to rename macro >> >> >SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF >> >> > >> >> >> >> Ack. >> > >> >CI: http://sssd-ci.duckdns.org/logs/job/37/61/summary.html >> > >> >Pushed to master: >> >* f6c1f6a561bdd5b4bba03c02988a724da3dad387 >> >* 21274963b575262b566115008119ef836c4db211 >> >* d833f316243f4ccd52b9b53dbd6e91c784825479 >> >* c426a8985a009e4506bef8dac76af4fa6fc2035c >> >* 22bbd95a48d21452fa5bb1a96b43334503bf8132 >> >* 2a44a8c6683cfea218ee5329bcfad953dfeb6746 >> > >> >It would be nice to push them also to sssd-1-13, since the patches are >> >low-risk and omitting them might make backporting to sssd-1-13 harder >> >later on, but the patches don't apply.. >> patches don't apply becuase hbac debug feature is not in 1.13. >> But I might prepare version without hbac debug feature. >> Should I prepare patches also for 1.13? >> I also realized that new line will not be printed after ldb messages. > >I wonder if it was more systematic to wait until your samba patches are >accepted? > But latest libldb needn't be in all distribution. LS ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On Tue, Feb 23, 2016 at 01:32:19PM +0100, Lukas Slebodnik wrote: > On (23/02/16 13:15), Jakub Hrozek wrote: > >On Tue, Feb 23, 2016 at 12:41:04PM +0100, Lukas Slebodnik wrote: > >> On (23/02/16 12:30), Jakub Hrozek wrote: > >> >On Fri, Feb 12, 2016 at 11:33:34AM +0100, Pavel Březina wrote: > >> >> On 01/15/2016 12:44 PM, Lukas Slebodnik wrote: > >> >> >On (15/01/16 12:03), Pavel Březina wrote: > >> >> >>On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: > >> >> >>>ehlo, > >> >> >>> > >> >> >>>The main reason for these patch was to improve > >> >> >>>recently added logging to hbac. > >> >> >>> > >> >> >>>Side effect of these change is improvement for libldb > >> >> >>>and libsemanage (6th patch) > >> >> >>> > >> >> >>>4th patch is not API/ABI change because > >> >> >>>such version has not beeen released yet. > >> >> >>>If you do not like change in hbac callback > >> >> >>>hbac_debug_fn_t then we should also remove > >> >> >>>because it is too internal then we should > >> >> >>>remove also the first two arguments. > >> >> >>>"file", "line" also leaks internal data from libhbac. > >> >> >>>Removing the first two arguments would be almost > >> >> >>>consistent callbacks in libldb and libsemanage. > >> >> >>> > >> >> >>>LS > >> >> >> > >> >> >>Hi, > >> >> >>I'm getting following errors: > >> >> >> > >> >> >>In file included from > >> >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: > >> >> >>/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: > >> >> >>error: > >> >> >>"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] > >> >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, > >> >> >>a1, a2))) > >> >> >>^ > >> >> >>In file included from > >> >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: > >> >> >>/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the > >> >> >>location of the previous definition > >> >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, > >> >> >>a1, > >> >> >>a2))) > >> >> >> > >> >> >I might add another #ifdef guard but I decided to rename macro > >> >> >SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF > >> >> > > >> >> > >> >> Ack. > >> > > >> >CI: http://sssd-ci.duckdns.org/logs/job/37/61/summary.html > >> > > >> >Pushed to master: > >> >* f6c1f6a561bdd5b4bba03c02988a724da3dad387 > >> >* 21274963b575262b566115008119ef836c4db211 > >> >* d833f316243f4ccd52b9b53dbd6e91c784825479 > >> >* c426a8985a009e4506bef8dac76af4fa6fc2035c > >> >* 22bbd95a48d21452fa5bb1a96b43334503bf8132 > >> >* 2a44a8c6683cfea218ee5329bcfad953dfeb6746 > >> > > >> >It would be nice to push them also to sssd-1-13, since the patches are > >> >low-risk and omitting them might make backporting to sssd-1-13 harder > >> >later on, but the patches don't apply.. > >> patches don't apply becuase hbac debug feature is not in 1.13. > >> But I might prepare version without hbac debug feature. > >> > Should I prepare patches also for 1.13? it would be nice. > > >> I also realized that new line will not be printed after ldb messages. > > > >I wonder if it was more systematic to wait until your samba patches are > >accepted? > > > But latest libldb needn't be in all distribution. But wouldn't we then have double-newlines in some cases? ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On (23/02/16 13:38), Jakub Hrozek wrote: >On Tue, Feb 23, 2016 at 01:32:19PM +0100, Lukas Slebodnik wrote: >> On (23/02/16 13:15), Jakub Hrozek wrote: >> >On Tue, Feb 23, 2016 at 12:41:04PM +0100, Lukas Slebodnik wrote: >> >> On (23/02/16 12:30), Jakub Hrozek wrote: >> >> >On Fri, Feb 12, 2016 at 11:33:34AM +0100, Pavel Březina wrote: >> >> >> On 01/15/2016 12:44 PM, Lukas Slebodnik wrote: >> >> >> >On (15/01/16 12:03), Pavel Březina wrote: >> >> >> >>On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: >> >> >> >>>ehlo, >> >> >> >>> >> >> >> >>>The main reason for these patch was to improve >> >> >> >>>recently added logging to hbac. >> >> >> >>> >> >> >> >>>Side effect of these change is improvement for libldb >> >> >> >>>and libsemanage (6th patch) >> >> >> >>> >> >> >> >>>4th patch is not API/ABI change because >> >> >> >>>such version has not beeen released yet. >> >> >> >>>If you do not like change in hbac callback >> >> >> >>>hbac_debug_fn_t then we should also remove >> >> >> >>>because it is too internal then we should >> >> >> >>>remove also the first two arguments. >> >> >> >>>"file", "line" also leaks internal data from libhbac. >> >> >> >>>Removing the first two arguments would be almost >> >> >> >>>consistent callbacks in libldb and libsemanage. >> >> >> >>> >> >> >> >>>LS >> >> >> >> >> >> >> >>Hi, >> >> >> >>I'm getting following errors: >> >> >> >> >> >> >> >>In file included from >> >> >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: >> >> >> >>/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: >> >> >> >>error: >> >> >> >>"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] >> >> >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, >> >> >> >>a1, a2))) >> >> >> >>^ >> >> >> >>In file included from >> >> >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: >> >> >> >>/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the >> >> >> >>location of the previous definition >> >> >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, >> >> >> >>a1, >> >> >> >>a2))) >> >> >> >> >> >> >> >I might add another #ifdef guard but I decided to rename macro >> >> >> >SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF >> >> >> > >> >> >> >> >> >> Ack. >> >> > >> >> >CI: http://sssd-ci.duckdns.org/logs/job/37/61/summary.html >> >> > >> >> >Pushed to master: >> >> >* f6c1f6a561bdd5b4bba03c02988a724da3dad387 >> >> >* 21274963b575262b566115008119ef836c4db211 >> >> >* d833f316243f4ccd52b9b53dbd6e91c784825479 >> >> >* c426a8985a009e4506bef8dac76af4fa6fc2035c >> >> >* 22bbd95a48d21452fa5bb1a96b43334503bf8132 >> >> >* 2a44a8c6683cfea218ee5329bcfad953dfeb6746 >> >> > >> >> >It would be nice to push them also to sssd-1-13, since the patches are >> >> >low-risk and omitting them might make backporting to sssd-1-13 harder >> >> >later on, but the patches don't apply.. >> >> patches don't apply becuase hbac debug feature is not in 1.13. >> >> But I might prepare version without hbac debug feature. >> >> >> Should I prepare patches also for 1.13? > >it would be nice. > >> >> >> I also realized that new line will not be printed after ldb messages. >> > >> >I wonder if it was more systematic to wait until your samba patches are >> >accepted? >> > >> But latest libldb needn't be in all distribution. > >But wouldn't we then have double-newlines in some cases? We already have (Tue Feb 23 14:29:12 2016) [sssd[be[redhat.com]]] [ldb] (0x4000): Added timed event "ltdb_callback": 0x5621f8ace430 (Tue Feb 23 14:29:12 2016) [sssd[be[redhat.com]]] [ldb] (0x4000): Added timed event "ltdb_timeout": 0x5621f8ae3c30 (Tue Feb 23 14:29:12 2016) [sssd[be[redhat.com]]] [ldb] (0x4000): Running timer event 0x5621f8ace430 "ltdb_callback" (Tue Feb 23 14:29:12 2016) [sssd[be[redhat.com]]] [ldb] (0x4000): Destroying timer event 0x5621f8ae3c30 "ltdb_timeout" (Tue Feb 23 14:29:12 2016) [sssd[be[redhat.com]]] [ldb] (0x4000): Ending timer event 0x5621f8ace430 "ltdb_callback" (Tue Feb 23 14:29:12 2016) [sssd[be[redhat.com]]] [ldb] (0x0400): asq: Unable to register control with rootdse! (Tue Feb 23 14:29:12 2016) [sssd[be[redhat.com]]] [ldb] (0x4000): Added timed event "ltdb_callback": 0x5621f8acd460 (Tue Feb 23 14:29:12 2016) [sssd[be[redhat.com]]] [ldb] (0x4000): Added timed event "ltdb_timeout": 0x5621f8ace370 LS ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On (23/02/16 13:38), Jakub Hrozek wrote: >On Tue, Feb 23, 2016 at 01:32:19PM +0100, Lukas Slebodnik wrote: >> On (23/02/16 13:15), Jakub Hrozek wrote: >> >On Tue, Feb 23, 2016 at 12:41:04PM +0100, Lukas Slebodnik wrote: >> >> On (23/02/16 12:30), Jakub Hrozek wrote: >> >> >On Fri, Feb 12, 2016 at 11:33:34AM +0100, Pavel Březina wrote: >> >> >> On 01/15/2016 12:44 PM, Lukas Slebodnik wrote: >> >> >> >On (15/01/16 12:03), Pavel Březina wrote: >> >> >> >>On 01/12/2016 10:15 AM, Lukas Slebodnik wrote: >> >> >> >>>ehlo, >> >> >> >>> >> >> >> >>>The main reason for these patch was to improve >> >> >> >>>recently added logging to hbac. >> >> >> >>> >> >> >> >>>Side effect of these change is improvement for libldb >> >> >> >>>and libsemanage (6th patch) >> >> >> >>> >> >> >> >>>4th patch is not API/ABI change because >> >> >> >>>such version has not beeen released yet. >> >> >> >>>If you do not like change in hbac callback >> >> >> >>>hbac_debug_fn_t then we should also remove >> >> >> >>>because it is too internal then we should >> >> >> >>>remove also the first two arguments. >> >> >> >>>"file", "line" also leaks internal data from libhbac. >> >> >> >>>Removing the first two arguments would be almost >> >> >> >>>consistent callbacks in libldb and libsemanage. >> >> >> >>> >> >> >> >>>LS >> >> >> >> >> >> >> >>Hi, >> >> >> >>I'm getting following errors: >> >> >> >> >> >> >> >>In file included from >> >> >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:26:0: >> >> >> >>/home/pbrezina/workspace/sssd/src/providers/ipa/ipa_hbac.h:54:0: >> >> >> >>error: >> >> >> >>"SSS_ATTRIBUTE_PRINTF" redefined [-Werror] >> >> >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__((format(printf, >> >> >> >>a1, a2))) >> >> >> >>^ >> >> >> >>In file included from >> >> >> >>/home/pbrezina/workspace/sssd/src/python/pyhbac.c:24:0: >> >> >> >>/home/pbrezina/workspace/sssd/src/util/util.h:62:0: note: this is the >> >> >> >>location of the previous definition >> >> >> >>#define SSS_ATTRIBUTE_PRINTF(a1, a2) __attribute__ ((format (printf, >> >> >> >>a1, >> >> >> >>a2))) >> >> >> >> >> >> >> >I might add another #ifdef guard but I decided to rename macro >> >> >> >SSS_ATTRIBUTE_PRINTF -> HBAC_ATTRIBUTE_PRINTF >> >> >> > >> >> >> >> >> >> Ack. >> >> > >> >> >CI: http://sssd-ci.duckdns.org/logs/job/37/61/summary.html >> >> > >> >> >Pushed to master: >> >> >* f6c1f6a561bdd5b4bba03c02988a724da3dad387 >> >> >* 21274963b575262b566115008119ef836c4db211 >> >> >* d833f316243f4ccd52b9b53dbd6e91c784825479 >> >> >* c426a8985a009e4506bef8dac76af4fa6fc2035c >> >> >* 22bbd95a48d21452fa5bb1a96b43334503bf8132 >> >> >* 2a44a8c6683cfea218ee5329bcfad953dfeb6746 >> >> > >> >> >It would be nice to push them also to sssd-1-13, since the patches are >> >> >low-risk and omitting them might make backporting to sssd-1-13 harder >> >> >later on, but the patches don't apply.. >> >> patches don't apply becuase hbac debug feature is not in 1.13. >> >> But I might prepare version without hbac debug feature. >> >> >> Should I prepare patches also for 1.13? > >it would be nice. > Attached are patches for 1.13 branch. The count of patches is smaller becuase we do not want to backport hbac patches. LS >From 79aeda0020b87613ab9d0e8dc135e0f2552baaa7 Mon Sep 17 00:00:00 2001 From: Lukas Slebodnik Date: Mon, 11 Jan 2016 18:54:40 +0100 Subject: [PATCH 1/3] UTIL: Use prefix for debug function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Pavel Březina (cherry picked from commit 2a44a8c6683cfea218ee5329bcfad953dfeb6746) --- src/util/debug.c| 12 ++-- src/util/sss_semanage.c | 2 +- src/util/util.h | 16 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/util/debug.c b/src/util/debug.c index b6ab368db824bbd297dcb410c3e669d911ff0d33..570c80273c0bdda1cc8df0e6af825595cfa339e0 100644 --- a/src/util/debug.c +++ b/src/util/debug.c @@ -206,11 +206,11 @@ journal_done: } #endif /* WiTH_JOURNALD */ -void debug_fn(const char *file, - long line, - const char *function, - int level, - const char *format, ...) +void sss_debug_fn(const char *file, + long line, + const char *function, + int level, + const char *format, ...) { va_list ap; struct timeval tv; @@ -301,7 +301,7 @@ void ldb_debug_messages(void *context, enum ldb_debug_level level, } if (DEBUG_IS_SET(loglevel)) -debug_fn(__FILE__, __LINE__, "ldb", loglevel, "%s\n", message); +sss_debug_fn(__FILE__, __LINE__, "ldb", loglevel, "%s\n", message); free(message); } diff --git a/src/util/sss_semanage.c b/src/util/sss_semanage.c index d1d03988c05dc011dbd465051d50fe6acca4f845..4fb9df589bbfddcc815ed321b6e3b32655d44a0c 100644 --- a/src/util/sss_semanage.c +++ b/src/util/sss_semanage.c @@ -64,7 +64,7 @@ static void sss_s
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On Tue, Feb 23, 2016 at 02:38:11PM +0100, Lukas Slebodnik wrote: > >> Should I prepare patches also for 1.13? > > > >it would be nice. > > > Attached are patches for 1.13 branch. > The count of patches is smaller becuase we do not want to > backport hbac patches. > > LS make and make check passed, CI was submitted.. ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On Tue, Feb 23, 2016 at 02:47:54PM +0100, Jakub Hrozek wrote: > On Tue, Feb 23, 2016 at 02:38:11PM +0100, Lukas Slebodnik wrote: > > >> Should I prepare patches also for 1.13? > > > > > >it would be nice. > > > > > Attached are patches for 1.13 branch. > > The count of patches is smaller becuase we do not want to > > backport hbac patches. > > > > LS > > make and make check passed, CI was submitted.. ACK. CI: http://sssd-ci.duckdns.org/logs/job/37/76/summary.html (The RHEL-7 failure is unrelated) ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org
[SSSD] Re: [PATCHES] UTIL: Provide varargs version of debug_fn
On Tue, Feb 23, 2016 at 09:13:00PM +0100, Jakub Hrozek wrote: > On Tue, Feb 23, 2016 at 02:47:54PM +0100, Jakub Hrozek wrote: > > On Tue, Feb 23, 2016 at 02:38:11PM +0100, Lukas Slebodnik wrote: > > > >> Should I prepare patches also for 1.13? > > > > > > > >it would be nice. > > > > > > > Attached are patches for 1.13 branch. > > > The count of patches is smaller becuase we do not want to > > > backport hbac patches. > > > > > > LS > > > > make and make check passed, CI was submitted.. > > ACK. CI: http://sssd-ci.duckdns.org/logs/job/37/76/summary.html > > (The RHEL-7 failure is unrelated) * sssd-1-13: * 86ba562d09e1ee9aa55819d748722c2d3ac00600 * c99096a5f0a6e47c50e91ecd9ebbdf2a18195fa8 * 4772bb86902552cb2fc18c3127b74f8cde5252ea ___ sssd-devel mailing list sssd-devel@lists.fedorahosted.org https://lists.fedorahosted.org/admin/lists/sssd-devel@lists.fedorahosted.org