Re: [PATCH 2/2] nfsidmap: Added -v flag

[Steve Dickson <SteveD@redhat.com>]

On 11/10/2011 04:19 PM, Bryan Schumaker wrote:
> On 11/10/2011 03:26 PM, Steve Dickson wrote:
>> To aid in debugging, the -v flag can now be specified
>> on the command to enable verbose logging in both
>> the nfsidmap command and libnfsidmap library routines.
>>
>> Signed-off-by: Steve Dickson <steved@redhat.com>
>> ---
>>  utils/nfsidmap/nfsidmap.c   |   12 ++++++++++++
>>  utils/nfsidmap/nfsidmap.man |   15 ++++++++++++---
>>  2 files changed, 24 insertions(+), 3 deletions(-)
>>
>> diff --git a/utils/nfsidmap/nfsidmap.c b/utils/nfsidmap/nfsidmap.c
>> index 134d9bc..d74189a 100644
>> --- a/utils/nfsidmap/nfsidmap.c
>> +++ b/utils/nfsidmap/nfsidmap.c
>> @@ -12,6 +12,7 @@
>>  #include <syslog.h>
>>  #include "xlog.h"
> 
> Is the syslog.h still needed here?  I don't think I see anything that uses it.  
Probably not...

> If I knew about xlog, I probably would have used that while writing nfsidmap.
No biggie... :-) 

steved.

> 
> - Bryan
> 
>>  
>> +int verbose = 0;
>>  /* gcc nfsidmap.c -o nfsidmap -l nfsidmap -l keyutils */
>>  
>>  #define MAX_ID_LEN   11
>> @@ -108,6 +109,12 @@ int main(int argc, char **argv)
>>  	xlog_syslog(1);
>>  	xlog_stderr(0);
>>  
>> +	if (argc > 1 && strcmp(argv[1], "-v") == 0) {
>> +		verbose = 1;
>> +		nfs4_set_debug(1, NULL);
>> +		argc--, argv++;
>> +	}
>> +
>>  	if (argc < 3) {
>>  		xlog_err("Bad arg count. Check /etc/request-key.conf");
>>  		return 1;
>> @@ -126,6 +133,11 @@ int main(int argc, char **argv)
>>  
>>  	key = strtol(argv[1], NULL, 10);
>>  
>> +	if (verbose) {
>> +		xlog_warn("key: %ld type: %s value: %s timeout %ld",
>> +			key, type, value, timeout);
>> +	}
>> +
>>  	if (strcmp(type, "uid") == 0)
>>  		rc = id_lookup(value, key, USER);
>>  	else if (strcmp(type, "gid") == 0)
>> diff --git a/utils/nfsidmap/nfsidmap.man b/utils/nfsidmap/nfsidmap.man
>> index 2381908..aa4d94b 100644
>> --- a/utils/nfsidmap/nfsidmap.man
>> +++ b/utils/nfsidmap/nfsidmap.man
>> @@ -5,6 +5,8 @@
>>  .TH nfsidmap 5 "1 October 2010"
>>  .SH NAME
>>  nfsidmap \- The NFS idmapper upcall program
>> +.SH SYNOPSIS
>> +.B "nfsidmap [-v] key user [timeout]"
>>  .SH DESCRIPTION
>>  The file
>>  .I /usr/sbin/nfsidmap
>> @@ -14,9 +16,16 @@ the upcall and cache the result.
>>  .I /usr/sbin/nfsidmap
>>  should only be called by request-key, and will perform the translation and
>>  initialize a key with the resulting information.
>> -.PP
>> -NFS_USE_NEW_IDMAPPER must be selected when configuring the kernel to use this
>> -feature.
>> +.SH OPTIONS
>> +.TP
>> +.B -v
>> +Enables verbose logging in both the
>> +.B nfsidmap
>> +binary and in the library routines
>> +that are used.
>> +.B Note,
>> +the -v flag has to be the first argument on the
>> +command to enable the logging.
>>  .SH CONFIGURING
>>  The file
>>  .I /etc/request-key.conf
>