diff options
| author | Barry Jaspan <bjaspan@mit.edu> | 1996-12-03 20:40:42 +0000 |
|---|---|---|
| committer | Barry Jaspan <bjaspan@mit.edu> | 1996-12-03 20:40:42 +0000 |
| commit | 073771e88ad5cd708d3ee18e206cb06d9f138c0a (patch) | |
| tree | 2b2158b43851f3da5efd4254a8fa7baa4895c209 /src/kadmin/cli | |
| parent | 0122fdaf3d1bd4196784564da4e62a0fbfebb858 (diff) | |
| download | krb5-073771e88ad5cd708d3ee18e206cb06d9f138c0a.tar.gz krb5-073771e88ad5cd708d3ee18e206cb06d9f138c0a.tar.xz krb5-073771e88ad5cd708d3ee18e206cb06d9f138c0a.zip | |
* kadmin.c (kadmin_addprinc): print warning/notice about no policy
and default policy [krb5-admin/252]
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@9597 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/cli')
| -rw-r--r-- | src/kadmin/cli/ChangeLog | 5 | ||||
| -rw-r--r-- | src/kadmin/cli/kadmin.c | 30 |
2 files changed, 27 insertions, 8 deletions
diff --git a/src/kadmin/cli/ChangeLog b/src/kadmin/cli/ChangeLog index d06ca6e98c..9c28f25e1d 100644 --- a/src/kadmin/cli/ChangeLog +++ b/src/kadmin/cli/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 3 15:39:11 1996 Barry Jaspan <bjaspan@mit.edu> + + * kadmin.c (kadmin_addprinc): print warning/notice about no policy + and default policy [krb5-admin/252] + Wed Nov 13 14:29:02 1996 Tom Yu <tlyu@mit.edu> * Makefile.in (clean-unix): Remove getdate.c and kadmin_ct.c. diff --git a/src/kadmin/cli/kadmin.c b/src/kadmin/cli/kadmin.c index d8011f86e4..a684a2e58a 100644 --- a/src/kadmin/cli/kadmin.c +++ b/src/kadmin/cli/kadmin.c @@ -377,27 +377,34 @@ char *kadmin_startup(argc, argv) * Initialize the kadm5 connection. If we were given a ccache, * use it. Otherwise, use/prompt for the password. */ - if (ccache_name) + if (ccache_name) { + printf("Authenticating as principal %s with existing credentials.\n", + princstr); retval = kadm5_init_with_creds(princstr, cc, KADM5_ADMIN_SERVICE, ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, &handle); - else if (use_keytab) + } else if (use_keytab) { + printf("Authenticating as principal %s with keytab %s.\n", + princstr, keytab_name); retval = kadm5_init_with_skey(princstr, keytab_name, KADM5_ADMIN_SERVICE, ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, &handle); - else + } else { + printf("Authenticating as principal %s with password.\n", + princstr); retval = kadm5_init_with_password(princstr, password, KADM5_ADMIN_SERVICE, ¶ms, KADM5_STRUCT_VERSION, KADM5_API_VERSION_2, &handle); + } if (retval) { com_err(whoami, retval, "while initializing %s interface", whoami); if (retval == KADM5_BAD_CLIENT_PARAMS || @@ -814,11 +821,18 @@ void kadmin_addprinc(argc, argv) * unset, since it is never valid for kadm5_create_principal. */ if ((! (mask & KADM5_POLICY)) && - (! (mask & KADM5_POLICY_CLR)) && - (! (retval = kadm5_get_policy(handle, "default", &defpol)))) { - princ.policy = "default"; - mask |= KADM5_POLICY; - (void) kadm5_free_policy_ent(handle, &defpol); + (! (mask & KADM5_POLICY_CLR))) { + if (! kadm5_get_policy(handle, "default", &defpol)) { + fprintf(stderr, + "NOTICE: no policy specified for %s; assigning \"default\"\n", + canon); + princ.policy = "default"; + mask |= KADM5_POLICY; + (void) kadm5_free_policy_ent(handle, &defpol); + } else + fprintf(stderr, + "WARNING: no policy specified for %s; defaulting to no policy\n", + canon); } mask &= ~KADM5_POLICY_CLR; |