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

Add canonicalize flag.

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@20229 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2007-02-16 03:40:58 +00:00
parent fbfd45f8e4
commit 27b0d0e0d1
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
kuser/kinit.c
View File

@@ -74,6 +74,7 @@ char *password_file = NULL;
char *pk_user_id = NULL; char *pk_user_id = NULL;
char *pk_x509_anchors = NULL; char *pk_x509_anchors = NULL;
int pk_use_enckey = 0; int pk_use_enckey = 0;
static int canonicalize_flag = 0;
static char *krb4_cc_name; static char *krb4_cc_name;
@@ -153,6 +154,9 @@ static struct getargs args[] = {
{ "password-file", 0, arg_string, &password_file, { "password-file", 0, arg_string, &password_file,
"read the password from a file" }, "read the password from a file" },
{ "canonicalize",0, arg_flag, &canonicalize_flag,
"canonicalize client principal" },
#ifdef PKINIT #ifdef PKINIT
{ "pk-user", 'C', arg_string, &pk_user_id, { "pk-user", 'C', arg_string, &pk_user_id,
"principal's public/private/certificate identifier", "principal's public/private/certificate identifier",
@@ -512,6 +516,8 @@ get_new_tickets(krb5_context context,
if (pac_flag != -1) if (pac_flag != -1)
krb5_get_init_creds_opt_set_pac_request(context, opt, krb5_get_init_creds_opt_set_pac_request(context, opt,
pac_flag ? TRUE : FALSE); pac_flag ? TRUE : FALSE);
if (canonicalize_flag)
krb5_get_init_creds_opt_set_canonicalize(context, opt, TRUE);
if (pk_user_id) { if (pk_user_id) {
ret = krb5_get_init_creds_opt_set_pkinit(context, opt, ret = krb5_get_init_creds_opt_set_pkinit(context, opt,
principal, principal,
@@ -774,6 +780,7 @@ main (int argc, char **argv)
krb5_principal principal; krb5_principal principal;
int optidx = 0; int optidx = 0;
krb5_deltat ticket_life = 0; krb5_deltat ticket_life = 0;
int parseflags = 0;
setprogname (argv[0]); setprogname (argv[0]);
@@ -797,8 +804,11 @@ main (int argc, char **argv)
argc -= optidx; argc -= optidx;
argv += optidx; argv += optidx;
if (canonicalize_flag)
parseflags |= KRB5_PRINCIPAL_PARSE_ENTERPRISE;
if (argv[0]) { if (argv[0]) {
ret = krb5_parse_name (context, argv[0], &principal); ret = krb5_parse_name_flags (context, argv[0], parseflags, &principal);
if (ret) if (ret)
krb5_err (context, 1, ret, "krb5_parse_name"); krb5_err (context, 1, ret, "krb5_parse_name");
} else { } else {