diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-06 16:01:15 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:48:20 +0100 |
| commit | fd1870e4f7370a184850e35a3d83157c664a79de (patch) | |
| tree | b69c0fa6d3005dc3572eb5a7b63bac514eff4ef7 /source4/lib/cmdline/popt_credentials.c | |
| parent | 1fbe268ec9a4d7367befd21e88f53781cd82cf1a (diff) | |
| download | samba-fd1870e4f7370a184850e35a3d83157c664a79de.tar.gz samba-fd1870e4f7370a184850e35a3d83157c664a79de.tar.bz2 samba-fd1870e4f7370a184850e35a3d83157c664a79de.zip | |
r26308: Split up big popt common callback function.
(This used to be commit bd2d6e0595c7ef897bbc6fdea50b96a7c1b94031)
Diffstat (limited to 'source4/lib/cmdline/popt_credentials.c')
| -rw-r--r-- | source4/lib/cmdline/popt_credentials.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/source4/lib/cmdline/popt_credentials.c b/source4/lib/cmdline/popt_credentials.c index 03142a7602..25c9a2e5ff 100644 --- a/source4/lib/cmdline/popt_credentials.c +++ b/source4/lib/cmdline/popt_credentials.c @@ -54,6 +54,8 @@ static void popt_common_credentials_callback(poptContext con, const struct poptOption *opt, const char *arg, const void *data) { + struct cli_credentials *creds = data; + if (reason == POPT_CALLBACK_REASON_PRE) { cmdline_credentials = cli_credentials_init(talloc_autofree_context()); return; @@ -94,10 +96,6 @@ static void popt_common_credentials_callback(poptContext con, cli_credentials_parse_file(cmdline_credentials, arg, CRED_SPECIFIED); break; - case 'S': - lp_set_cmdline(global_loadparm, "client signing", arg); - break; - case 'P': /* Later, after this is all over, get the machine account details from the secrets.ldb */ cli_credentials_set_machine_account_pending(cmdline_credentials); @@ -136,7 +134,6 @@ struct poptOption popt_common_credentials[] = { { "no-pass", 'N', POPT_ARG_NONE, &dont_ask, 'N', "Don't ask for a password" }, { "password", 0, POPT_ARG_STRING, NULL, OPT_PASSWORD, "Password" }, { "authentication-file", 'A', POPT_ARG_STRING, NULL, 'A', "Get the credentials from a file", "FILE" }, - { "signing", 'S', POPT_ARG_STRING, NULL, 'S', "Set the client signing state", "on|off|required" }, { "machine-pass", 'P', POPT_ARG_NONE, NULL, 'P', "Use stored machine account password (implies -k)" }, { "simple-bind-dn", 0, POPT_ARG_STRING, NULL, OPT_SIMPLE_BIND_DN, "DN to use for a simple bind" }, { "kerberos", 'k', POPT_ARG_STRING, NULL, OPT_KERBEROS, "Use Kerberos" }, |