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

kadmin/check: move error messages to stderr

Browse Source 
This helps with certain automation tools, such as ansible, that usually
expect failure to be visible in stderr.

Other minor changes:
* replace "doesn't" with "does not" to keep messages consistent and
  avoid escaping quotes in grep, etc.
* add newlines
This commit is contained in:
Siva Mahadevan
2023-06-19 14:36:55 -04:00
committed by Nico Williams
parent e8e8b78d65
commit a7019d4b88
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
kadmin/check.c
View File

@@ -136,8 +136,9 @@ check(void *opt, int argc, char **argv)
ret = get_check_entry(p, &ent); ret = get_check_entry(p, &ent);
if (ret) { if (ret) {
printf("%s doesn't exist, are you sure %s is a realm in your database", fprintf(stderr,
p, realm); "%s does not exist, are you sure %s is a realm in your database?\n",
p, realm);
free(p); free(p);
goto fail; goto fail;
} }
@@ -156,8 +157,9 @@ check(void *opt, int argc, char **argv)
ret = get_check_entry(p, &ent); ret = get_check_entry(p, &ent);
if (ret) { if (ret) {
printf("%s doesn't exist, " fprintf(stderr,
"there is no way to do remote administration", p); "%s does not exist, there is no way to do remote administration.\n",
p);
free(p); free(p);
goto fail; goto fail;
} }
@@ -176,8 +178,9 @@ check(void *opt, int argc, char **argv)
ret = get_check_entry(p, &ent); ret = get_check_entry(p, &ent);
if (ret) { if (ret) {
printf("%s doesn't exist, " fprintf(stderr,
"there is no way to do change password", p); "%s does not exist, there is no way to do change password.\n",
p);
free(p); free(p);
goto fail; goto fail;
} }
@@ -189,7 +192,7 @@ check(void *opt, int argc, char **argv)
* Check default@REALM * Check default@REALM
* *
* Check that disallow-all-tix is set on the default principal * Check that disallow-all-tix is set on the default principal
* (or that the entry doesn't exists) * (or that the entry does not exist)
*/ */
if (asprintf(&p, "default@%s", realm) == -1) { if (asprintf(&p, "default@%s", realm) == -1) {
@@ -200,7 +203,7 @@ check(void *opt, int argc, char **argv)
ret = get_check_entry(p, &ent); ret = get_check_entry(p, &ent);
if (ret == 0) { if (ret == 0) {
if ((ent.attributes & KRB5_KDB_DISALLOW_ALL_TIX) == 0) { if ((ent.attributes & KRB5_KDB_DISALLOW_ALL_TIX) == 0) {
printf("default template entry is not disabled\n"); fprintf(stderr, "default template entry is not disabled\n");
ret = EINVAL; ret = EINVAL;
} }
kadm5_free_principal_ent(kadm_handle, &ent); kadm5_free_principal_ent(kadm_handle, &ent);