const char *arg, const void *data)
{
if (reason == POPT_CALLBACK_REASON_PRE) {
- cmdline_credentials = cli_credentials_init(talloc_autofree_context());
+ popt_set_cmdline_credentials(
+ cli_credentials_init(talloc_autofree_context()));
return;
}
if (reason == POPT_CALLBACK_REASON_POST) {
- cli_credentials_guess(cmdline_credentials, cmdline_lp_ctx);
+ cli_credentials_guess(popt_get_cmdline_credentials(),
+ cmdline_lp_ctx);
if (!dont_ask) {
- cli_credentials_set_cmdline_callbacks(cmdline_credentials);
+ cli_credentials_set_cmdline_callbacks(
+ popt_get_cmdline_credentials());
}
if (machine_account_pending) {
- cli_credentials_set_machine_account(cmdline_credentials, cmdline_lp_ctx);
+ cli_credentials_set_machine_account(
+ popt_get_cmdline_credentials(), cmdline_lp_ctx);
}
return;
{
char *lp;
- cli_credentials_parse_string(cmdline_credentials, arg, CRED_SPECIFIED);
+ cli_credentials_parse_string(
+ popt_get_cmdline_credentials(), arg, CRED_SPECIFIED);
/* This breaks the abstraction, including the const above */
if ((lp=strchr_m(arg,'%'))) {
lp[0]='\0';
break;
case OPT_PASSWORD:
- cli_credentials_set_password(cmdline_credentials, arg, CRED_SPECIFIED);
+ cli_credentials_set_password(popt_get_cmdline_credentials(),
+ arg, CRED_SPECIFIED);
/* Try to prevent this showing up in ps */
memset(discard_const(arg),0,strlen(arg));
break;
case 'A':
- cli_credentials_parse_file(cmdline_credentials, arg, CRED_SPECIFIED);
+ cli_credentials_parse_file(popt_get_cmdline_credentials(),
+ arg, CRED_SPECIFIED);
break;
case 'P':
}
}
- cli_credentials_set_kerberos_state(cmdline_credentials,
+ cli_credentials_set_kerberos_state(
+ popt_get_cmdline_credentials(),
use_kerberos
? CRED_MUST_USE_KERBEROS
: CRED_DONT_USE_KERBEROS);
case OPT_SIMPLE_BIND_DN:
{
- cli_credentials_set_bind_dn(cmdline_credentials, arg);
+ cli_credentials_set_bind_dn(popt_get_cmdline_credentials(),
+ arg);
break;
}
case OPT_KRB5_CCACHE:
{
const char *error_string;
- if (cli_credentials_set_ccache(cmdline_credentials, cmdline_lp_ctx, arg, CRED_SPECIFIED,
+ if (cli_credentials_set_ccache(
+ popt_get_cmdline_credentials(), cmdline_lp_ctx,
+ arg, CRED_SPECIFIED,
&error_string) != 0) {
fprintf(stderr, "Error reading krb5 credentials cache: '%s' %s", arg, error_string);
exit(1);
{
uint32_t gensec_features;
- gensec_features = cli_credentials_get_gensec_features(cmdline_credentials);
+ gensec_features = cli_credentials_get_gensec_features(
+ popt_get_cmdline_credentials());
gensec_features |= GENSEC_FEATURE_SIGN;
- cli_credentials_set_gensec_features(cmdline_credentials,
+ cli_credentials_set_gensec_features(
+ popt_get_cmdline_credentials(),
gensec_features);
break;
}
{
uint32_t gensec_features;
- gensec_features = cli_credentials_get_gensec_features(cmdline_credentials);
+ gensec_features = cli_credentials_get_gensec_features(
+ popt_get_cmdline_credentials());
gensec_features |= GENSEC_FEATURE_SEAL;
- cli_credentials_set_gensec_features(cmdline_credentials,
+ cli_credentials_set_gensec_features(
+ popt_get_cmdline_credentials(),
gensec_features);
break;
}