From 9b46b7ef27a6154eb4c8a559c9d79a8f639a90cc Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Feb 07 2020 07:15:07 +0000 Subject: [PATCH 1/2] ignored containers are part of a shared backend code ignored_containers_sdn is defined in src/back-shr.c and referenced in src/back-shr.h for the actual backends to use. Header file, however, has to use 'external' or it would be defining the variable at each inclusion. Fixes: RHBZ#1800097 Signed-off-by: Alexander Bokovoy --- diff --git a/src/back-shr.h b/src/back-shr.h index d01b999..e9b88c5 100644 --- a/src/back-shr.h +++ b/src/back-shr.h @@ -37,7 +37,7 @@ void set_plugin_monitor_status(int lock_status); int get_plugin_monitor_count(void); void set_plugin_monitor_count(int lock_count); void init_map_lock(void); -Slapi_DN **ignored_containers_sdn; +extern Slapi_DN **ignored_containers_sdn; struct plugin_state; From 165708d2fc3891b49e7ca3fde731f8e37844452a Mon Sep 17 00:00:00 2001 From: Alexander Bokovoy Date: Feb 07 2020 07:18:22 +0000 Subject: [PATCH 2/2] Streamline error message when no user information is available --- diff --git a/src/back-sch-pam.c b/src/back-sch-pam.c index a59e6e3..798c8a8 100644 --- a/src/back-sch-pam.c +++ b/src/back-sch-pam.c @@ -168,9 +168,8 @@ map_pam_error(Slapi_PBlock *pb, const char *fn, } } else { if (rc == PAM_SUCCESS) { - *errmsg = PR_smprintf("PAM %s succeeds for user \"%s\" " - "(bind DN \"%s\")", - fn, user, binddn); + *errmsg = PR_smprintf("PAM %s succeeds for bind DN \"%s\"", + fn, binddn); } else { if (pamh != NULL) { *errmsg = PR_smprintf("PAM %s error for invalid user "