Revoke some of the popt patch from metze I applied earlier today. It added

some double options and broke some parameters.
(This used to be commit d5f9b0275c91512e1926504f22aaeec2d104430d)

7 files changed, 9 insertions, 6 deletions

diff --git a/source3/utils/net.c b/source3/utils/net.c
index d6945ceefb..3ab34e7aa9 100644
--- a/source3/utils/net.c
+++ b/source3/utils/net.c
@@ -530,6 +530,7 @@ static struct functable net_func[] = {
 		{"force",	'f', POPT_ARG_NONE,   &opt_force},
 		{"timeout",	't', POPT_ARG_INT,    &opt_timeout},
 		{"machine-pass",'P', POPT_ARG_NONE,   &opt_machine_pass},
+		{"myworkgroup", 'W', POPT_ARG_STRING, &opt_workgroup},
 		POPT_COMMON_SAMBA
 		{ 0, 0, 0, 0}
 	};
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c
index 88038fb566..85f092c8b0 100644
--- a/source3/utils/nmblookup.c
+++ b/source3/utils/nmblookup.c
@@ -203,6 +203,7 @@ int main(int argc,char *argv[])
 	  { "root-port", 'r', POPT_ARG_VAL, &RootPort, True, "Use root port 137 (Win95 only replies to this)" },
 	  { "lookup-by-ip", 'A', POPT_ARG_VAL, &lookup_by_ip, True, "Do a node status on <name> as an IP Address" },
 	  POPT_COMMON_SAMBA
+	  POPT_COMMON_CONNECTION
 	  { 0, 0, 0, 0 }
   };
 	
diff --git a/source3/utils/ntlm_auth.c b/source3/utils/ntlm_auth.c
index a28bbf9364..f02bd5f5b3 100644
--- a/source3/utils/ntlm_auth.c
+++ b/source3/utils/ntlm_auth.c
@@ -457,7 +457,8 @@ enum {
 		{ "request-lm-key", 0, POPT_ARG_NONE, &request_lm_key, OPT_LM_KEY, "Retreive LM session key"},
 		{ "request-nt-key", 0, POPT_ARG_NONE, &request_nt_key, OPT_NT_KEY, "Retreive NT session key"},
 		POPT_COMMON_SAMBA
-		POPT_CREDENTIALS
+		POPT_COMMON_CONNECTION
+		POPT_COMMON_CREDENTIALS
 		POPT_TABLEEND
 	};
 
diff --git a/source3/utils/pdbedit.c b/source3/utils/pdbedit.c
index 03be2571e5..f33dbd9f1c 100644
--- a/source3/utils/pdbedit.c
+++ b/source3/utils/pdbedit.c
@@ -516,7 +516,7 @@ int main (int argc, char **argv)
 	poptContext pc;
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
-		{"list",	'l', POPT_ARG_NONE, &list_users, 0, "list all users", NULL},
+		{"list",	'L', POPT_ARG_NONE, &list_users, 0, "list all users", NULL},
 		{"verbose",	'v', POPT_ARG_NONE, &verbose, 0, "be verbose", NULL },
 		{"smbpasswd-style",	'w',POPT_ARG_NONE, &spstyle, 0, "give output in smbpasswd style", NULL},
 		{"user",	'u', POPT_ARG_STRING, &user_name, 0, "use username", "USER" },
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index ac15cf1aa0..562fd9943f 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -758,7 +758,7 @@ static struct cli_state *connect_one(const char *share)
 		{ "numeric", 0, POPT_ARG_NONE, &numeric, True, "Don't resolve sids or masks to names" },
 		{ "test-args", 't', POPT_ARG_NONE, &test_args, True, "Test arguments"},
 		POPT_COMMON_SAMBA
-		POPT_CREDENTIALS
+		POPT_COMMON_CREDENTIALS
 		{ NULL }
 	};
 
diff --git a/source3/utils/smbtree.c b/source3/utils/smbtree.c
index 32506c4101..52de5ab467 100644
--- a/source3/utils/smbtree.c
+++ b/source3/utils/smbtree.c
@@ -251,7 +251,7 @@ static BOOL print_tree(struct user_auth_info *user_info)
 		{ "domains", 'D', POPT_ARG_VAL, &level, LEV_WORKGROUP, "List only domains (workgroups) of tree" },
 		{ "servers", 'S', POPT_ARG_VAL, &level, LEV_SERVER, "List domains(workgroups) and servers of tree" },
 		POPT_COMMON_SAMBA
-		POPT_CREDENTIALS
+		POPT_COMMON_CREDENTIALS
 		POPT_TABLEEND
 	};
 	poptContext pc;
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index c0e4f7606e..4c8a2ccf63 100644
--- a/source3/utils/testparm.c
+++ b/source3/utils/testparm.c
@@ -206,8 +206,8 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 		{"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"},
 		{"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"},
 		{"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"},
-		POPT_COMMON_SAMBA
-		{0,0,0,0}
+		POPT_COMMON_VERSION
+		POPT_TABLEEND
 	};
 
 	pc = poptGetContext(NULL, argc, argv, long_options,