From patchwork Tue Jan 8 17:28:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 210455 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from aserp1040.oracle.com (aserp1040.oracle.com [141.146.126.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "aserp1040.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 59D402C008D for ; Wed, 9 Jan 2013 04:28:26 +1100 (EST) Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r08HSMLB007697 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 8 Jan 2013 17:28:23 GMT Received: from oss.oracle.com (oss-external.oracle.com [137.254.96.51]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r08HSMtQ009562 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 8 Jan 2013 17:28:22 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TscyM-0001IY-Fr; Tue, 08 Jan 2013 09:28:22 -0800 Received: from ucsinet22.oracle.com ([156.151.31.94]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1TscyL-0001IL-1k for fedfs-utils-devel@oss.oracle.com; Tue, 08 Jan 2013 09:28:21 -0800 Received: from aserp1020.oracle.com (aserp1020.oracle.com [141.146.126.67]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r08HSKIf008502 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 8 Jan 2013 17:28:20 GMT Received: from mail-ie0-f179.google.com (mail-ie0-f179.google.com [209.85.223.179]) by aserp1020.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r08HSJiV024205 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=OK) for ; Tue, 8 Jan 2013 17:28:19 GMT Received: by mail-ie0-f179.google.com with SMTP id k14so836399iea.24 for ; Tue, 08 Jan 2013 09:28:18 -0800 (PST) X-Received: by 10.50.214.2 with SMTP id nw2mr9931908igc.110.1357666098801; Tue, 08 Jan 2013 09:28:18 -0800 (PST) Received: from seurat.1015granger.net (adsl-99-26-161-222.dsl.sfldmi.sbcglobal.net. [99.26.161.222]) by mx.google.com with ESMTPS id c3sm260206igj.1.2013.01.08.09.28.17 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 08 Jan 2013 09:28:18 -0800 (PST) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Tue, 08 Jan 2013 12:28:17 -0500 Message-ID: <20130108172816.65133.126.stgit@seurat.1015granger.net> In-Reply-To: <20130108172057.65133.25145.stgit@seurat.1015granger.net> References: <20130108172057.65133.25145.stgit@seurat.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Flow-Control-Info: class=Default reputation=ipRepBelow100 ip=209.85.223.179 ct-class=R5 ct-vol1=0 ct-vol2=8 ct-vol3=8 ct-risk=47 ct-spam1=75 ct-spam2=6 ct-bulk=6 rcpts=1 size=7313 X-MM-CT-Classification: not spam X-MM-CT-RefID: str=0001.0A090202.50EC5734.002B,ss=1,re=0.000,fgs=0 Subject: [fedfs-utils] [PATCH 08/13] libnsdb: Add API to enable LDAP library debugging X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: acsinet22.oracle.com [141.146.126.238] Signed-off-by: Chuck Lever --- src/include/nsdb.h | 5 +++++ src/libnsdb/ldap.c | 22 ++++++++++++++++++++++ src/nsdbc/nsdb-annotate.c | 1 + src/nsdbc/nsdb-create-fsl.c | 1 + src/nsdbc/nsdb-create-fsn.c | 1 + src/nsdbc/nsdb-delete-fsl.c | 1 + src/nsdbc/nsdb-delete-fsn.c | 1 + src/nsdbc/nsdb-delete-nsdb.c | 1 + src/nsdbc/nsdb-describe.c | 1 + src/nsdbc/nsdb-list.c | 1 + src/nsdbc/nsdb-nces.c | 1 + src/nsdbc/nsdb-remove-nci.c | 1 + src/nsdbc/nsdb-resolve-fsn.c | 1 + src/nsdbc/nsdb-simple-nce.c | 1 + src/nsdbc/nsdb-update-fsl.c | 1 + src/nsdbc/nsdb-update-nci.c | 1 + 16 files changed, 41 insertions(+), 0 deletions(-) diff --git a/src/include/nsdb.h b/src/include/nsdb.h index 2895433..81b1bd6 100644 --- a/src/include/nsdb.h +++ b/src/include/nsdb.h @@ -391,6 +391,11 @@ FedFsStatus nsdb_ping_s(const char *hostname, const unsigned short port, unsigned int *ldap_err); /** + * Enable LDAP debugging when contacting an NSDB + */ +void nsdb_enable_ldap_debugging(void); + +/** ** Readability helpers **/ const char *nsdb_display_fedfsconnectionsec(const FedFsConnectionSec sectype); diff --git a/src/libnsdb/ldap.c b/src/libnsdb/ldap.c index cec593e..7f001a0 100644 --- a/src/libnsdb/ldap.c +++ b/src/libnsdb/ldap.c @@ -129,6 +129,28 @@ __nsdb_modify_nsdb_s(const char *func, LDAP *ld, const char *dn, LDAPMod *mod, __nsdb_modify_nsdb_s(__func__, ld, dn, mod, ldaperr) /** + * Enable LDAP debugging when contacting an NSDB + * + */ +void +nsdb_enable_ldap_debugging(void) +{ + int rc, debug; + + debug = 0xffff; /* LDAP_DEBUG_ANY */ + +#if 0 + rc = ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &debug); + if (rc != LBER_OPT_SUCCESS) + xlog(L_ERROR, "Failed to set LBER_OPT_DEBUG_LEVEL"); +#endif + + rc = ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &debug); + if (rc != LDAP_OPT_SUCCESS ) + xlog(L_ERROR, "Failed to set LDAP_OPT_DEBUG_LEVEL"); +} + +/** * Read a password from stdin, disabling character echo * * @return a NUL-terminated C string containing the typed-in password. Caller must free the string with free(3) diff --git a/src/nsdbc/nsdb-annotate.c b/src/nsdbc/nsdb-annotate.c index c4ad5f4..ed9cbe1 100644 --- a/src/nsdbc/nsdb-annotate.c +++ b/src/nsdbc/nsdb-annotate.c @@ -147,6 +147,7 @@ main(int argc, char **argv) break; case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-create-fsl.c b/src/nsdbc/nsdb-create-fsl.c index 845d452..432d7b4 100644 --- a/src/nsdbc/nsdb-create-fsl.c +++ b/src/nsdbc/nsdb-create-fsl.c @@ -141,6 +141,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-create-fsn.c b/src/nsdbc/nsdb-create-fsn.c index fd53120..b0b31e8 100644 --- a/src/nsdbc/nsdb-create-fsn.c +++ b/src/nsdbc/nsdb-create-fsn.c @@ -145,6 +145,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-delete-fsl.c b/src/nsdbc/nsdb-delete-fsl.c index 726845f..30f3e87 100644 --- a/src/nsdbc/nsdb-delete-fsl.c +++ b/src/nsdbc/nsdb-delete-fsl.c @@ -140,6 +140,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-delete-fsn.c b/src/nsdbc/nsdb-delete-fsn.c index f3927f0..5355a92 100644 --- a/src/nsdbc/nsdb-delete-fsn.c +++ b/src/nsdbc/nsdb-delete-fsn.c @@ -139,6 +139,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-delete-nsdb.c b/src/nsdbc/nsdb-delete-nsdb.c index f76d786..2777b51 100644 --- a/src/nsdbc/nsdb-delete-nsdb.c +++ b/src/nsdbc/nsdb-delete-nsdb.c @@ -129,6 +129,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-describe.c b/src/nsdbc/nsdb-describe.c index 947cab1..944380a 100644 --- a/src/nsdbc/nsdb-describe.c +++ b/src/nsdbc/nsdb-describe.c @@ -142,6 +142,7 @@ main(int argc, char **argv) break; case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-list.c b/src/nsdbc/nsdb-list.c index e3a8ab0..e02761c 100644 --- a/src/nsdbc/nsdb-list.c +++ b/src/nsdbc/nsdb-list.c @@ -233,6 +233,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'e': nce = optarg; diff --git a/src/nsdbc/nsdb-nces.c b/src/nsdbc/nsdb-nces.c index 247ccf6..0c32159 100644 --- a/src/nsdbc/nsdb-nces.c +++ b/src/nsdbc/nsdb-nces.c @@ -129,6 +129,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'l': nsdbname = optarg; diff --git a/src/nsdbc/nsdb-remove-nci.c b/src/nsdbc/nsdb-remove-nci.c index 4de2b10..0d852d4 100644 --- a/src/nsdbc/nsdb-remove-nci.c +++ b/src/nsdbc/nsdb-remove-nci.c @@ -131,6 +131,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-resolve-fsn.c b/src/nsdbc/nsdb-resolve-fsn.c index 23d292d..9b93df7 100644 --- a/src/nsdbc/nsdb-resolve-fsn.c +++ b/src/nsdbc/nsdb-resolve-fsn.c @@ -283,6 +283,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'e': nce = optarg; diff --git a/src/nsdbc/nsdb-simple-nce.c b/src/nsdbc/nsdb-simple-nce.c index d6530cf..dca1cdf 100644 --- a/src/nsdbc/nsdb-simple-nce.c +++ b/src/nsdbc/nsdb-simple-nce.c @@ -129,6 +129,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-update-fsl.c b/src/nsdbc/nsdb-update-fsl.c index cfd7e13..80c4047 100644 --- a/src/nsdbc/nsdb-update-fsl.c +++ b/src/nsdbc/nsdb-update-fsl.c @@ -143,6 +143,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg; diff --git a/src/nsdbc/nsdb-update-nci.c b/src/nsdbc/nsdb-update-nci.c index cb057af..757b080 100644 --- a/src/nsdbc/nsdb-update-nci.c +++ b/src/nsdbc/nsdb-update-nci.c @@ -136,6 +136,7 @@ main(int argc, char **argv) switch (arg) { case 'd': xlog_config(D_ALL, 1); + nsdb_enable_ldap_debugging(); break; case 'D': binddn = optarg;