diff options
| author | Kevin Coffman <kwc@citi.umich.edu> | 2007-03-30 18:32:10 -0400 |
|---|---|---|
| committer | Neil Brown <neilb@suse.de> | 2007-03-31 09:08:02 +1000 |
| commit | 72e1cf8784fbcb1bffa28b08f663ea9469634590 (patch) | |
| tree | 2ca8a5ca11ff36b4f52c647543bba603e8bcba3f /utils/gssd/krb5_util.c | |
| parent | 9a6cf25c17c4a7d69600d3802ea8c990cd317b9f (diff) | |
| download | nfs-utils-72e1cf8784fbcb1bffa28b08f663ea9469634590.tar.gz nfs-utils-72e1cf8784fbcb1bffa28b08f663ea9469634590.tar.xz nfs-utils-72e1cf8784fbcb1bffa28b08f663ea9469634590.zip | |
Hide differences between MIT and Heimdal in macros
Clean up a lot of #ifdef'd code using macros, masking
the differences between MIT and Heimdal implementations.
The currently unused macros will be used in later patches.
Signed-off-by: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Diffstat (limited to 'utils/gssd/krb5_util.c')
| -rw-r--r-- | utils/gssd/krb5_util.c | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/utils/gssd/krb5_util.c b/utils/gssd/krb5_util.c index a0ee110..7ef690b 100644 --- a/utils/gssd/krb5_util.c +++ b/utils/gssd/krb5_util.c @@ -364,11 +364,7 @@ gssd_get_single_krb5_cred(krb5_context context, "principal '%s' from keytab '%s'\n", error_message(code), pname ? pname : "<unparsable>", kt_name); -#ifdef HAVE_KRB5 - if (pname) krb5_free_unparsed_name(context, pname); -#else - if (pname) free(pname); -#endif + if (pname) k5_free_unparsed_name(context, pname); goto out; } @@ -497,11 +493,7 @@ gssd_process_krb5_keytab(krb5_context context, krb5_keytab kt, char *kt_name) if (ple == NULL) { printerr(0, "ERROR: could not allocate storage " "for principal list entry\n"); -#ifdef HAVE_KRB5 - krb5_free_unparsed_name(context, pname); -#else - free(pname); -#endif + k5_free_unparsed_name(context, pname); krb5_kt_free_entry(context, &kte); retval = ENOMEM; goto out; @@ -521,11 +513,7 @@ gssd_process_krb5_keytab(krb5_context context, krb5_keytab kt, char *kt_name) printerr(0, "ERROR: %s while copying realm to " "principal list entry\n", "not enough memory"); -#ifdef HAVE_KRB5 - krb5_free_unparsed_name(context, pname); -#else - free(pname); -#endif + k5_free_unparsed_name(context, pname); krb5_kt_free_entry(context, &kte); retval = ENOMEM; goto out; @@ -535,11 +523,7 @@ gssd_process_krb5_keytab(krb5_context context, krb5_keytab kt, char *kt_name) printerr(0, "ERROR: %s while copying principal " "to principal list entry\n", error_message(code)); -#ifdef HAVE_KRB5 - krb5_free_unparsed_name(context, pname); -#else - free(pname); -#endif + k5_free_unparsed_name(context, pname); krb5_kt_free_entry(context, &kte); retval = code; goto out; @@ -555,11 +539,7 @@ gssd_process_krb5_keytab(krb5_context context, krb5_keytab kt, char *kt_name) printerr(2, "We will NOT use this entry (%s)\n", pname); } -#ifdef HAVE_KRB5 - krb5_free_unparsed_name(context, pname); -#else - free(pname); -#endif + k5_free_unparsed_name(context, pname); krb5_kt_free_entry(context, &kte); } |