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

(kt_add): reorganize some. open the keytab (defaulting to the modify

Browse Source 
one)


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9884 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
2001-05-10 15:39:15 +00:00
parent 341d187004
commit b341554465
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
admin/add.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -39,6 +39,7 @@ int
kt_add(int argc, char **argv) kt_add(int argc, char **argv)
{ {
krb5_error_code ret; krb5_error_code ret;
krb5_keytab keytab;
krb5_keytab_entry entry; krb5_keytab_entry entry;
char buf[128]; char buf[128];
char *principal_string = NULL; char *principal_string = NULL;
@@ -71,30 +72,47 @@ kt_add(int argc, char **argv)
if(getarg(args, num_args, argc, argv, &optind)) { if(getarg(args, num_args, argc, argv, &optind)) {
arg_printusage(args, num_args, "ktutil add", ""); arg_printusage(args, num_args, "ktutil add", "");
return 0; return 1;
} }
if(help_flag) { if(help_flag) {
arg_printusage(args, num_args, "ktutil add", ""); arg_printusage(args, num_args, "ktutil add", "");
return 0; return 1;
} }
if (keytab_string == NULL) {
ret = krb5_kt_default_modify_name (context, keytab_buf,
sizeof(keytab_buf));
if (ret) {
krb5_warn(context, ret, "krb5_kt_default_modify_name");
return 1;
}
keytab_string = keytab_buf;
}
ret = krb5_kt_resolve(context, keytab_string, &keytab);
if (ret) {
krb5_warn(context, ret, "resolving keytab %s", keytab_string);
return 1;
}
if (verbose_flag)
fprintf (stderr, "Using keytab %s\n", keytab_string);
memset(&entry, 0, sizeof(entry));
if(principal_string == NULL) { if(principal_string == NULL) {
printf("Principal: "); printf("Principal: ");
if (fgets(buf, sizeof(buf), stdin) == NULL) if (fgets(buf, sizeof(buf), stdin) == NULL)
return 0; return 1;
buf[strcspn(buf, "\r\n")] = '\0'; buf[strcspn(buf, "\r\n")] = '\0';
principal_string = buf; principal_string = buf;
} }
ret = krb5_parse_name(context, principal_string, &entry.principal); ret = krb5_parse_name(context, principal_string, &entry.principal);
if(ret) { if(ret) {
krb5_warn(context, ret, "%s", principal_string); krb5_warn(context, ret, "%s", principal_string);
return 0; goto out;
} }
if(enctype_string == NULL) { if(enctype_string == NULL) {
printf("Encryption type: "); printf("Encryption type: ");
if (fgets(buf, sizeof(buf), stdin) == NULL) { if (fgets(buf, sizeof(buf), stdin) == NULL)
krb5_free_principal (context, entry.principal); goto out;
return 0;
}
buf[strcspn(buf, "\r\n")] = '\0'; buf[strcspn(buf, "\r\n")] = '\0';
enctype_string = buf; enctype_string = buf;
} }
@@ -105,24 +123,19 @@ kt_add(int argc, char **argv)
enctype = t; enctype = t;
else { else {
krb5_warn(context, ret, "%s", enctype_string); krb5_warn(context, ret, "%s", enctype_string);
krb5_free_principal(context, entry.principal); goto out;
return 0;
} }
} }
if(kvno == -1) { if(kvno == -1) {
printf("Key version: "); printf("Key version: ");
if (fgets(buf, sizeof(buf), stdin) == NULL) { if (fgets(buf, sizeof(buf), stdin) == NULL)
krb5_free_principal (context, entry.principal); goto out;
return 0;
}
buf[strcspn(buf, "\r\n")] = '\0'; buf[strcspn(buf, "\r\n")] = '\0';
kvno = atoi(buf); kvno = atoi(buf);
} }
if(password_string == NULL && random_flag == 0) { if(password_string == NULL && random_flag == 0) {
if(des_read_pw_string(buf, sizeof(buf), "Password: ", 1)) { if(des_read_pw_string(buf, sizeof(buf), "Password: ", 1))
krb5_free_principal (context, entry.principal); goto out;
return 0;
}
password_string = buf; password_string = buf;
} }
if(password_string) { if(password_string) {
@@ -150,6 +163,8 @@ kt_add(int argc, char **argv)
ret = krb5_kt_add_entry(context, keytab, &entry); ret = krb5_kt_add_entry(context, keytab, &entry);
if(ret) if(ret)
krb5_warn(context, ret, "add"); krb5_warn(context, ret, "add");
out:
krb5_kt_free_entry(context, &entry); krb5_kt_free_entry(context, &entry);
krb5_kt_close(context, keytab);
return 0; return 0;
} }