diff options
| author | Simo Sorce <idra@samba.org> | 2010-08-18 06:46:53 -0400 |
|---|---|---|
| committer | Simo Sorce <idra@samba.org> | 2010-08-18 07:47:10 -0400 |
| commit | 71dfa62b61380396785c7856c38f45c77c966ff0 (patch) | |
| tree | 8c6e6d43a4f5087541a4faa6d65caa732170ff91 | |
| parent | 64d8300a56eb0891389a5a2afc5e4902c2d909a2 (diff) | |
| download | samba-71dfa62b61380396785c7856c38f45c77c966ff0.tar.gz samba-71dfa62b61380396785c7856c38f45c77c966ff0.tar.bz2 samba-71dfa62b61380396785c7856c38f45c77c966ff0.zip | |
s3-ads: cleanup ads_keytab_list()
| -rw-r--r-- | source3/libads/kerberos_keytab.c | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c index a2a5a453ff..d2215ecbb5 100644 --- a/source3/libads/kerberos_keytab.c +++ b/source3/libads/kerberos_keytab.c @@ -757,13 +757,15 @@ int ads_keytab_list(const char *keytab_name) initialize_krb5_error_table(); ret = krb5_init_context(&context); if (ret) { - DEBUG(1,("ads_keytab_list: could not krb5_init_context: %s\n",error_message(ret))); + DEBUG(1, (__location__ ": could not krb5_init_context: %s\n", + error_message(ret))); return ret; } ret = smb_krb5_open_keytab(context, keytab_name, False, &keytab); if (ret) { - DEBUG(1,("ads_keytab_list: smb_krb5_open_keytab failed (%s)\n", error_message(ret))); + DEBUG(1, (__location__ ": smb_krb5_open_keytab failed (%s)\n", + error_message(ret))); goto out; } @@ -775,12 +777,13 @@ int ads_keytab_list(const char *keytab_name) printf("Vno Type Principal\n"); while (krb5_kt_next_entry(context, keytab, &kt_entry, &cursor) == 0) { - + char *princ_s = NULL; char *etype_s = NULL; krb5_enctype enctype = 0; - ret = smb_krb5_unparse_name(talloc_tos(), context, kt_entry.principal, &princ_s); + ret = smb_krb5_unparse_name(talloc_tos(), context, + kt_entry.principal, &princ_s); if (ret) { goto out; } @@ -788,12 +791,10 @@ int ads_keytab_list(const char *keytab_name) enctype = smb_get_enctype_from_kt_entry(&kt_entry); ret = smb_krb5_enctype_to_string(context, enctype, &etype_s); - if (ret) { - if (asprintf(&etype_s, "UNKNOWN: %d\n", enctype) == -1) - { - TALLOC_FREE(princ_s); - goto out; - } + if (ret && + (asprintf(&etype_s, "UNKNOWN: %d\n", enctype) == -1)) { + TALLOC_FREE(princ_s); + goto out; } printf("%3d %s\t\t %s\n", kt_entry.vno, etype_s, princ_s); @@ -820,15 +821,17 @@ out: { krb5_keytab_entry zero_kt_entry; ZERO_STRUCT(zero_kt_entry); - if (memcmp(&zero_kt_entry, &kt_entry, sizeof(krb5_keytab_entry))) { + if (memcmp(&zero_kt_entry, &kt_entry, + sizeof(krb5_keytab_entry))) { smb_krb5_kt_free_entry(context, &kt_entry); } } { krb5_kt_cursor zero_csr; ZERO_STRUCT(zero_csr); - if ((memcmp(&cursor, &zero_csr, sizeof(krb5_kt_cursor)) != 0) && keytab) { - krb5_kt_end_seq_get(context, keytab, &cursor); + if ((memcmp(&cursor, &zero_csr, + sizeof(krb5_kt_cursor)) != 0) && keytab) { + krb5_kt_end_seq_get(context, keytab, &cursor); } } |