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

/sess-/session-/g since a few extra letter makes it easier to understand

Browse Source
This commit is contained in:
Love Hornquist Astrand
2013-09-03 21:56:04 -07:00
parent 502b33ca7f
commit 3e0fd6449e
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
kuser/kimpersonate.8
View File

@@ -46,7 +46,7 @@
.Op Fl e Ar integer \*(Ba Fl Fl expire-time= Ns Ar integer .Op Fl e Ar integer \*(Ba Fl Fl expire-time= Ns Ar integer
.Op Fl a Ar string \*(Ba Fl Fl client-address= Ns Ar string .Op Fl a Ar string \*(Ba Fl Fl client-address= Ns Ar string
.Op Fl t Ar string \*(Ba Fl Fl enc-type= Ns Ar string .Op Fl t Ar string \*(Ba Fl Fl enc-type= Ns Ar string
.Op Fl Fl sess-enc-type= Ns Ar string .Op Fl Fl session-enc-type= Ns Ar string
.Op Fl f Ar string \*(Ba Fl Fl ticket-flags= Ns Ar string .Op Fl f Ar string \*(Ba Fl Fl ticket-flags= Ns Ar string
.Op Fl Fl verbose .Op Fl Fl verbose
.Op Fl Fl version .Op Fl Fl version
@@ -73,7 +73,7 @@ lifetime of ticket in seconds
address of client address of client
.It Fl t Ar string Ns , Fl Fl enc-type= Ns Ar string .It Fl t Ar string Ns , Fl Fl enc-type= Ns Ar string
encryption type (defaults to "aes256-cts-hmac-sha1-96") encryption type (defaults to "aes256-cts-hmac-sha1-96")
.It Fl Fl sess-enc-type= Ns Ar string .It Fl Fl session-enc-type= Ns Ar string
session encryption type (defaults to enc-type or "des-cbc-crc" for afs service tickets) session encryption type (defaults to enc-type or "des-cbc-crc" for afs service tickets)
.It Fl f Ar string Ns , Fl Fl ticket-flags= Ns Ar string .It Fl f Ar string Ns , Fl Fl ticket-flags= Ns Ar string
ticket flags for krb5 ticket ticket flags for krb5 ticket

8
kuser/kimpersonate.c
View File

@@ -156,7 +156,7 @@ create_krb5_tickets (krb5_context context, krb5_keytab kt)
krb5_err (context, 1, ret, "krb5_string_to_enctype (enc-type)"); krb5_err (context, 1, ret, "krb5_string_to_enctype (enc-type)");
ret = krb5_string_to_enctype (context, session_enc_type, &session_etype); ret = krb5_string_to_enctype (context, session_enc_type, &session_etype);
if (ret) if (ret)
krb5_err (context, 1, ret, "krb5_string_to_enctype (sess-enc-type)"); krb5_err (context, 1, ret, "krb5_string_to_enctype (session-enc-type)");
ret = krb5_kt_get_entry (context, kt, server_principal, ret = krb5_kt_get_entry (context, kt, server_principal,
0, etype, &entry); 0, etype, &entry);
if (ret) if (ret)
@@ -249,7 +249,7 @@ setup_env (krb5_context context, krb5_keytab *kt)
if (ret) if (ret)
krb5_err (context, 1, ret, "resolvning server name"); krb5_err (context, 1, ret, "resolvning server name");
/* If no sess-enc-type specified on command line and this is an afs */ /* If no session-enc-type specified on command line and this is an afs */
/* service ticket, change default of session_enc_type to DES. */ /* service ticket, change default of session_enc_type to DES. */
if (session_enctype_string == NULL if (session_enctype_string == NULL
&& strcmp("afs", *server_principal->name.name_string.val) == 0) && strcmp("afs", *server_principal->name.name_string.val) == 0)
@@ -289,9 +289,9 @@ struct getargs args[] = {
"lifetime of ticket in seconds", NULL }, "lifetime of ticket in seconds", NULL },
{ "client-addresses", 'a', arg_strings, &client_addresses, { "client-addresses", 'a', arg_strings, &client_addresses,
"addresses of client", NULL }, "addresses of client", NULL },
{ "enc-type", 't', arg_string, &enctype_string, { "enc-type", 't', arg_string, &enctype_string,
"encryption type", NULL }, "encryption type", NULL },
{ "sess-enc-type", 0, arg_string, &session_enctype_string, { "session-enc-type", 0, arg_string,&session_enctype_string,
"encryption type", NULL }, "encryption type", NULL },
{ "ticket-flags", 'f', arg_string, &ticket_flags_str, { "ticket-flags", 'f', arg_string, &ticket_flags_str,
"ticket flags for krb5 ticket", NULL }, "ticket flags for krb5 ticket", NULL },