Ticket History #7925: 05cbef80d53 breaks /etc/gss/mech

Here's a patch:
From 03ecfebef9594035dc152585d1827a93f58bb221 Mon Sep 17 00:00:00 2001
From: Sam Hartman <hartmans@debian.org>
Date: Wed, 4 Jun 2014 12:03:19 -0400
Subject: Read /etc/gss/mech when no files in mech.d

If the call to glob fails, it's still necessary to read /etc/gss/mech
if that file exists.

ticket: 7925
---
src/lib/gssapi/mechglue/g_initialize.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/lib/gssapi/mechglue/g_initialize.c b/src/lib/gssapi/mechglue/g_initialize.c
index a586e1c..7fab03d 100644
--- a/src/lib/gssapi/mechglue/g_initialize.c
+++ b/src/lib/gssapi/mechglue/g_initialize.c
@@ -444,8 +444,18 @@ loadConfigFiles()
g_confLastCall = now;

globbuf.gl_offs = 1;
- if (glob(MECH_CONF_PATTERN, GLOB_DOOFFS, NULL, &globbuf) != 0)
+ if (glob(MECH_CONF_PATTERN, GLOB_DOOFFS, NULL, &globbuf) != 0) {
+ mtime = check_link_mtime(MECH_CONF, &mtime);
+ if (mtime == (time_t)-1)
+ return;
+ if (mtime > highest_mtime)
+ highest_mtime = mtime;
+ if (mtime > g_confFileModTime) {
+ loadConfigFile(MECH_CONF);
+ g_confFileModTime = highest_mtime;
+ }
return;
+ }
globbuf.gl_pathv[0] = MECH_CONF;

for (pathptr = globbuf.gl_pathv; *pathptr != NULL; pathptr++) {

Read /etc/gss/mech if no mech.d/*.conf found

Always read /etc/gss/mech, even if globbing /etc/gss/mech.d/*.conf
doesn't work. Doing this using GLOB_DOOFFS proved error-prone, so use
a simpler approach: factor out the per-pathname handling into a helper
function load_if_changed, call it with MECH_CONF before the glob, then
pass each glob result through the helper.

https://github.com/krb5/krb5/commit/ac98187641f6943ae571606c0b6a97f236f9b60c
Author: Greg Hudson <ghudson@mit.edu>
Commit: ac98187641f6943ae571606c0b6a97f236f9b60c
Branch: master
src/lib/gssapi/mechglue/g_initialize.c | 43 ++++++++++++++++++-------------
1 files changed, 25 insertions(+), 18 deletions(-)