From 2e483b0425c495b46cc9bddf298a80a139c91cd1 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Nov 12 2018 14:52:31 +0000
Subject: fixup! Add Kerberos GSSAPI configuration for the Fedora Account System


Updates from code review

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

---

diff --git a/fedora-user-agent-chrome.spec b/fedora-user-agent-chrome.spec
index 3155a6b..fac60e9 100644
--- a/fedora-user-agent-chrome.spec
+++ b/fedora-user-agent-chrome.spec
@@ -27,16 +27,19 @@ mkdir -p %{buildroot}%{_datadir}/chromium/extensions
 cp -a hojggiaghnldpcknpbciehjcaoafceil.json %{buildroot}%{_datadir}/google-chrome/extensions
 cp -a hojggiaghnldpcknpbciehjcaoafceil.json %{buildroot}%{_datadir}/chromium/extensions
 
-# Install the FAS kerberos configuration for Chrome and Chromium
+# Install the FAS kerberos configuration for Chrome
 # The managed policy directory does not merge identical keys and we don't want
 # to accidentally override any configuration that a site has installed here, so
 # we install it as 00_gssapi.json. If another file is present in this directory
 # that includes the same keys, it will supersede this file.
+#
+# At the moment, we cannot do the same for Chromium because of
+# https://bugzilla.redhat.com/show_bug.cgi?id=1640158
+# which results in a segfault if more than one TGT is present, which is common
+# for Red Hat employees working on Fedora.
 
-mkdir -p %{buildroot}/etc/chrome/policies/managed
-mkdir -p %{buildroot}/etc/opt/chrome/policies/managed
-cp -a %{SOURCE1} %{buildroot}/etc/chrome/policies/managed/
-ln -s /etc/chrome/policies/managed/00_gssapi.json %{buildroot}/etc/opt/chrome/policies/managed/
+mkdir -p %{buildroot}%{_sysconfdir}/opt/chrome/policies/managed
+cp -a %{SOURCE1} %{buildroot}%{_sysconfdir}/opt/chrome/policies/managed/
 
 
 %files
@@ -47,10 +50,8 @@ ln -s /etc/chrome/policies/managed/00_gssapi.json %{buildroot}/etc/opt/chrome/po
 %{_datadir}/google-chrome/extensions/hojggiaghnldpcknpbciehjcaoafceil.json
 %{_datadir}/chromium/extensions/hojggiaghnldpcknpbciehjcaoafceil.json
 
-%dir /etc/chrome/policies/managed/
-%config(noreplace)/etc/chrome/policies/managed/00_gssapi.json
-%dir /etc/opt/chrome/policies/managed/
-/etc/opt/chrome/policies/managed/00_gssapi.json
+%dir %{_sysconfdir}/opt/chrome/policies/managed/
+%config(noreplace) %{_sysconfdir}/opt/chrome/policies/managed/00_gssapi.json
 
 
 %license LICENSE