Fix the popt / bool issues. Some places we used BOOL

where we meant int. Fix this. Thanks to metze for
pointing this out.
Jeremy.
(This used to be commit 793a9d24a163cb6cf5a3a0aa5ae30e9f8cf4744a)

1 files changed, 36 insertions, 14 deletions

diff --git a/source3/utils/status.c b/source3/utils/status.c
index d5e482f6fb..8bf1de0e61 100644
--- a/source3/utils/status.c
+++ b/source3/utils/status.c
@@ -38,12 +38,12 @@ static struct server_id	Ucrit_pid[SMB_MAXPIDS];  /* Ugly !!! */   /* added by OH
 static int		Ucrit_MaxPid=0;                    /* added by OH */
 static unsigned int	Ucrit_IsActive = 0;                /* added by OH */
 
-static int verbose, brief;
-static int            shares_only = 0;            /* Added by RJS */
-static int            locks_only  = 0;            /* Added by RJS */
-static bool processes_only=False;
-static int show_brl;
-static bool numeric_only = False;
+static bool verbose, brief;
+static bool shares_only;            /* Added by RJS */
+static bool locks_only;            /* Added by RJS */
+static bool processes_only;
+static bool show_brl;
+static bool numeric_only;
 
 const char *username = NULL;
 
@@ -281,16 +281,16 @@ static int traverse_sessionid(struct db_record *db, void *state)
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
-		{"processes",	'p', POPT_ARG_NONE,	&processes_only, 'p', "Show processes only" },
-		{"verbose",	'v', POPT_ARG_NONE, &verbose, 'v', "Be verbose" },
-		{"locks",	'L', POPT_ARG_NONE,	&locks_only, 'L', "Show locks only" },
-		{"shares",	'S', POPT_ARG_NONE,	&shares_only, 'S', "Show shares only" },
+		{"processes",	'p', POPT_ARG_NONE,	NULL, 'p', "Show processes only" },
+		{"verbose",	'v', POPT_ARG_NONE, 	NULL, 'v', "Be verbose" },
+		{"locks",	'L', POPT_ARG_NONE,	NULL, 'L', "Show locks only" },
+		{"shares",	'S', POPT_ARG_NONE,	NULL, 'S', "Show shares only" },
 		{"user", 	'u', POPT_ARG_STRING,	&username, 'u', "Switch to user" },
-		{"brief",	'b', POPT_ARG_NONE, 	&brief, 'b', "Be brief" },
+		{"brief",	'b', POPT_ARG_NONE, 	NULL, 'b', "Be brief" },
 		{"profile",     'P', POPT_ARG_NONE, NULL, 'P', "Do profiling" },
 		{"profile-rates", 'R', POPT_ARG_NONE, NULL, 'R', "Show call rates" },
-		{"byterange",	'B', POPT_ARG_NONE,	&show_brl, 'B', "Include byte range locks"},
-		{"numeric",	'n', POPT_ARG_NONE,	&numeric_only, 'n', "Numeric uid/gid"},
+		{"byterange",	'B', POPT_ARG_NONE,	NULL, 'B', "Include byte range locks"},
+		{"numeric",	'n', POPT_ARG_NONE,	NULL, 'n', "Numeric uid/gid"},
 		POPT_COMMON_SAMBA
 		POPT_TABLEEND
 	};
@@ -315,12 +315,34 @@ static int traverse_sessionid(struct db_record *db, void *state)
 	
 	while ((c = poptGetNextOpt(pc)) != -1) {
 		switch (c) {
-		case 'u':                                      
+		case 'p':
+			processes_only = true;
+			break;
+		case 'v':
+			verbose = true;
+			break;
+		case 'L':
+			locks_only = true;
+			break;
+		case 'S':
+			shares_only = true;
+			break;
+		case 'b':
+			brief = true;
+			break;
+		case 'u':
 			Ucrit_addUid(nametouid(poptGetOptArg(pc)));
 			break;
 		case 'P':
 		case 'R':
 			profile_only = c;
+			break;
+		case 'B':
+			show_brl = true;
+			break;
+		case 'n':
+			numeric_only = true;
+			break;
 		}
 	}