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

lib/krb5: fallback Windows default ccname to HLKM

Browse Source 
Windows queries the default ccache name via the registry.  Prior
to this change only the HKEY_CURRENT_USER hive.  Fallback to
HKEY_LOCAL_MACHINE if there is no "ccname" value specified for the
user.  This permits system or domain administrators to set the
default ccache to MSLSA: for all users.

Change-Id: Ide3b51358f8fc6944ca698e4a68295be9463d4e0
This commit is contained in:
Jeffrey Altman
2016-03-31 10:24:25 -05:00
parent 13568961ec
commit eb1545382a
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/krb5/cache.c
View File

@@ -1815,18 +1815,17 @@ krb5_cc_get_kdc_offset(krb5_context context, krb5_ccache id, krb5_deltat *offset
return (*id->ops->get_kdc_offset)(context, id, offset); return (*id->ops->get_kdc_offset)(context, id, offset);
} }
#ifdef _WIN32 #ifdef _WIN32
#define REGPATH_MIT_KRB5 "SOFTWARE\\MIT\\Kerberos5" #define REGPATH_MIT_KRB5 "SOFTWARE\\MIT\\Kerberos5"
KRB5_LIB_FUNCTION char * KRB5_LIB_CALL
_krb5_get_default_cc_name_from_registry(krb5_context context) static char *
_get_default_cc_name_from_registry(krb5_context context, HKEY hkBase)
{ {
HKEY hk_k5 = 0; HKEY hk_k5 = 0;
LONG code; LONG code;
char *ccname = NULL; char *ccname = NULL;
code = RegOpenKeyEx(HKEY_CURRENT_USER, code = RegOpenKeyEx(hkBase,
REGPATH_MIT_KRB5, REGPATH_MIT_KRB5,
0, KEY_READ, &hk_k5); 0, KEY_READ, &hk_k5);
@@ -1841,6 +1840,19 @@ _krb5_get_default_cc_name_from_registry(krb5_context context)
return ccname; return ccname;
} }
KRB5_LIB_FUNCTION char * KRB5_LIB_CALL
_krb5_get_default_cc_name_from_registry(krb5_context context)
{
char *ccname;
ccname = _get_default_cc_name_from_registry(context, HKEY_CURRENT_USER);
if (ccname == NULL)
ccname = _get_default_cc_name_from_registry(context,
HKEY_LOCAL_MACHINE);
return ccname;
}
KRB5_LIB_FUNCTION int KRB5_LIB_CALL KRB5_LIB_FUNCTION int KRB5_LIB_CALL
_krb5_set_default_cc_name_to_registry(krb5_context context, krb5_ccache id) _krb5_set_default_cc_name_to_registry(krb5_context context, krb5_ccache id)
{ {
@@ -1872,5 +1884,4 @@ _krb5_set_default_cc_name_to_registry(krb5_context context, krb5_ccache id)
return ret; return ret;
} }
#endif #endif