From 3789e98f8850188c9b5e169e98ba54bf388ae52c Mon Sep 17 00:00:00 2001 From: Andrew Deason Date: Tue, 26 Mar 2013 13:14:30 -0500 Subject: [PATCH] aklog: Search for /etc/krb5/krb5.conf aklog tweaks the KRB5_CONFIG environment var when performing one of our 'weak crypto' workarounds. We assume that the default krb5.conf is /etc/krb5.conf, but for Solaris 11 libkrb5, krb5.conf is in /etc/krb5/krb5.conf. Although this file could be anywhere, try /etc/krb5/krb5.conf too, so we at least work on stock Solaris. Reviewed-on: http://gerrit.openafs.org/9666 Reviewed-by: Derrick Brashear Tested-by: BuildBot Reviewed-by: Jeffrey Altman (cherry picked from commit cd1ffc1073d6f9a191e07cb72e8d0b4ec8cd6347) Change-Id: I8eeb406107592bac6da415d25b688d936a385a87 Reviewed-on: http://gerrit.openafs.org/9686 Tested-by: BuildBot Reviewed-by: Andrew Deason Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/aklog/aklog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/aklog/aklog.c b/src/aklog/aklog.c index c9fe9e864..bc61fbc6f 100644 --- a/src/aklog/aklog.c +++ b/src/aklog/aklog.c @@ -1520,7 +1520,7 @@ main(int argc, char *argv[]) { char *filepath = NULL, *newpath = NULL; #ifndef AFS_DARWIN_ENV - char *defaultpath = "/etc/krb5.conf"; + char *defaultpath = "/etc/krb5.conf:/etc/krb5/krb5.conf"; #else char *defaultpath = "~/Library/Preferences/edu.mit.Kerberos:/Library/Preferences/edu.mit.Kerberos"; #endif -- 2.39.5