X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fgssd%2Fkrb5_util.h;h=9cac2027196e554614a07750750d24c4e969220b;hp=da04530fdaeddd9d0adfac4f2ac31da8696643a8;hb=77458652703ab94da18e40728607e323dd2b65b1;hpb=f1bfe0916c04d93de7a4fae5315fff6e4ccac23f

diff --git a/utils/gssd/krb5_util.h b/utils/gssd/krb5_util.h
index da04530..9cac202 100644
--- a/utils/gssd/krb5_util.h
+++ b/utils/gssd/krb5_util.h
@@ -5,7 +5,8 @@
 
 /*
  * List of principals from our keytab that we
- * may try to get credentials for
+ * will try to use to obtain credentials
+ * (known as a principal list entry (ple))
  */
 struct gssd_k5_kt_princ {
 	struct gssd_k5_kt_princ *next;
@@ -18,13 +19,31 @@ struct gssd_k5_kt_princ {
 
 void gssd_setup_krb5_user_gss_ccache(uid_t uid, char *servername);
 int  gssd_get_krb5_machine_cred_list(char ***list);
-int  gssd_refresh_krb5_machine_creds(void);
 void gssd_free_krb5_machine_cred_list(char **list);
 void gssd_setup_krb5_machine_gss_ccache(char *servername);
 void gssd_destroy_krb5_machine_creds(void);
+int  gssd_refresh_krb5_machine_credential(char *hostname,
+					  struct gssd_k5_kt_princ *ple);
 
 #ifdef HAVE_SET_ALLOWABLE_ENCTYPES
 int limit_krb5_enctypes(struct rpc_gss_sec *sec, uid_t uid);
 #endif
 
+/*
+ * Hide away some of the MIT vs. Heimdal differences
+ * here with macros...
+ */
+
+#ifdef HAVE_KRB5
+#define k5_free_unparsed_name(ctx, name)	krb5_free_unparsed_name((ctx), (name))
+#define k5_free_default_realm(ctx, realm)	krb5_free_default_realm((ctx), (realm))
+#define k5_free_kt_entry(ctx, kte)		krb5_free_keytab_entry_contents((ctx),(kte))
+#else	/* Heimdal */
+#define k5_free_unparsed_name(ctx, name)	free(name)
+#define k5_free_default_realm(ctx, realm)	free(realm)
+#define k5_free_kt_entry(ctx, kte)		krb5_kt_free_entry((ctx),(kte))
+#undef USE_GSS_KRB5_CCACHE_NAME
+#define USE_GSS_KRB5_CCACHE_NAME 1
+#endif
+
 #endif /* KRB5_UTIL_H */