oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

wrap gssapi stuff with KRB5

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@12597 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-08-20 16:26:21 +00:00
parent a418bf8566
commit bbeffa1fb5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
appl/ftp/ftp/main.c
View File

@@ -59,8 +59,10 @@ struct getargs getargs[] = {
"passive mode", NULL}, "passive mode", NULL},
{ NULL, 't', arg_counter, &trace, { NULL, 't', arg_counter, &trace,
"Packet tracing", NULL}, "Packet tracing", NULL},
#ifdef KRB5
{ "gss-bindings", 0, arg_negative_flag, &ftp_do_gss_bindings, { "gss-bindings", 0, arg_negative_flag, &ftp_do_gss_bindings,
"Use GSS-API bindings", NULL}, "Use GSS-API bindings", NULL},
#endif
{ NULL, 'v', arg_counter, &verbose, { NULL, 'v', arg_counter, &verbose,
"verbosity", NULL}, "verbosity", NULL},
{ NULL, 'K', arg_negative_flag, &use_kerberos, { NULL, 'K', arg_negative_flag, &use_kerberos,
@@ -98,7 +100,9 @@ main(int argc, char **argv)
lineedit = 1; lineedit = 1;
passivemode = 0; /* passive mode not active */ passivemode = 0; /* passive mode not active */
use_kerberos = 1; use_kerberos = 1;
#ifdef KRB5
ftp_do_gss_bindings = 1; ftp_do_gss_bindings = 1;
#endif
if(getarg(getargs, num_args, argc, argv, &optind)) if(getarg(getargs, num_args, argc, argv, &optind))
usage(1); usage(1);

2
appl/ftp/ftpd/ftpd.c
View File

@@ -223,7 +223,9 @@ struct getargs args[] = {
{ NULL, 'v', arg_flag, &debug, "enable debugging" }, { NULL, 'v', arg_flag, &debug, "enable debugging" },
{ "builtin-ls", 'B', arg_flag, &use_builtin_ls, "use built-in ls to list files" }, { "builtin-ls", 'B', arg_flag, &use_builtin_ls, "use built-in ls to list files" },
{ "good-chars", 0, arg_string, &good_chars, "allowed anonymous upload filename chars" }, { "good-chars", 0, arg_string, &good_chars, "allowed anonymous upload filename chars" },
#ifdef KRB5
{ "gss-bindings", 0, arg_flag, &ftp_do_gss_bindings, "Require GSS-API bindings", NULL}, { "gss-bindings", 0, arg_flag, &ftp_do_gss_bindings, "Require GSS-API bindings", NULL},
#endif
{ "version", 0, arg_flag, &version_flag }, { "version", 0, arg_flag, &version_flag },
{ "help", 'h', arg_flag, &help_flag } { "help", 'h', arg_flag, &help_flag }
}; };