Merge remote branch 'h-github/master' into win32-port2
* h-github/master: (64 commits) refix socket wrappers with rk_ Patch from Secure Endpoints/Asanka Herath for windows support unset KRB5CCNAME its really just LIBADD more most of them correct quoting Use -lpthread for modern freebsd instead clean KRB5CCNAME and KRB5_CONFIG, require test to reset them more up ${env_setup} use PTHREADS_LIBADD for freebsd6 and newer add PTHREAD_LIBADD add PTHREAD_LIBADD add PTHREAD_LIBADD switch to PTHREADS_LIBADD log what the error string say too More debug logging sprinkle more 'echo "test failed"' sprinkle 'echo "test failed"' use calloc(), indent more prettier in sh, equal compare is really = for strings, not == Check for duplicates, already loaded mechs ... Conflicts (resolved): lib/krb5/auth_context.c lib/krb5/changepw.c lib/krb5/context.c lib/krb5/error_string.c lib/krb5/kuserok.c lib/krb5/libkrb5-exports.def.in lib/krb5/net_write.c lib/krb5/store_fd.c lib/krb5/test_cc.c lib/roken/strerror_r.c
This commit is contained in:
@@ -221,6 +221,9 @@ match_local_principals(krb5_context context,
|
||||
* ignored. Subdirectories are not traversed. Note that this directory
|
||||
* may not be checked by other Kerberos implementations.
|
||||
*
|
||||
* If no configuration file exists, match user against local domains,
|
||||
* ie luser@LOCAL-REALMS-IN-CONFIGURATION-FILES.
|
||||
*
|
||||
* @param context Kerberos 5 context.
|
||||
* @param principal principal to check if allowed to login
|
||||
* @param luser local user id
|
||||
@@ -293,10 +296,9 @@ krb5_kuserok (krb5_context context,
|
||||
|
||||
return FALSE;
|
||||
#else
|
||||
/* On Windows, for now we always return TRUE. The .k5login file
|
||||
may be on a remote profile and we don't have access to the
|
||||
profile until we have a token handle for the user's
|
||||
credentials. */
|
||||
return TRUE;
|
||||
/* The .k5login file may be on a remote profile and we don't have
|
||||
access to the profile until we have a token handle for the
|
||||
user's credentials. */
|
||||
return match_local_principals(context, principal, luser);
|
||||
#endif
|
||||
}
|
||||
|
Reference in New Issue
Block a user