mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-04-24 05:49:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "When adding a trusted cert, modify admin Trust Settings (instead of user) so that a GUI authentication dialog is not displayed."

Browse Source 
This reverts commit 6814c166e7.
This commit is contained in:
Greg Neagle
2014-06-16 15:35:18 -07:00
parent d824dea3c1
commit 5176ed1e36
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/client/munkilib/keychain.py
+4 -5
View File
@@ -121,9 +121,9 @@ def setup():
# Correct the filename to include '.keychain' if not already present
if not keychain_name.lower().endswith('.keychain'):
keychain_name += '.keychain'
# Check to see if the keychain already exists
# Check to see if a file already exists at ~/Library/Keychains/keychain_name
abs_keychain_path = os.path.realpath(
os.path.join(os.path.expanduser('/Library/Keychains'), keychain_name))
os.path.join(os.path.expanduser('~/Library/Keychains'), keychain_name))
if os.path.exists(abs_keychain_path):
ensure_keychain_is_in_search_list(abs_keychain_path)
try:
@@ -217,7 +217,7 @@ def make_keychain(abs_keychain_path):
if ca_cert_path:
try:
output = security(
'add-trusted-cert', '-d', '-k', abs_keychain_path, ca_cert_path)
'add-trusted-cert', '-k', abs_keychain_path, ca_cert_path)
except SecurityError, err:
munkicommon.display_error(
'Error importing %s: %s' % (ca_cert_path, err))
@@ -228,8 +228,7 @@ def make_keychain(abs_keychain_path):
cert_path = os.path.join(ca_dir_path, item)
try:
output = security(
'add-trusted-cert', '-d', '-k', abs_keychain_path,
cert_path)
'add-trusted-cert', '-k', abs_keychain_path, cert_path)
except SecurityError, err:
munkicommon.display_error(
'Error importing %s: %s' % (cert_path, err))