diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-02-03 12:36:34 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2015-02-03 12:36:34 +0000 |
| commit | 3abb875b96ccc947fe2c8161279ed019fc44d044 (patch) | |
| tree | 0ff3556d335b4adc4020c01a41e2297e93df786d /cups/tls-darwin.c | |
| parent | eb098ba20b02321dbec2f5117300a32e6f971b87 (diff) | |
| download | cups-3abb875b96ccc947fe2c8161279ed019fc44d044.tar.gz | |
Fix several issues with client.conf, CUPS_SERVER, and the "-h" option of most
commands (STR #4528)
Load default client.conf values in the proper order, and then allow them to be
overridden.
git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12480 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'cups/tls-darwin.c')
| -rw-r--r-- | cups/tls-darwin.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cups/tls-darwin.c b/cups/tls-darwin.c index ff54b11ab..b75684af7 100644 --- a/cups/tls-darwin.c +++ b/cups/tls-darwin.c @@ -3,7 +3,7 @@ * * TLS support code for CUPS on OS X. * - * Copyright 2007-2014 by Apple Inc. + * Copyright 2007-2015 by Apple Inc. * Copyright 1997-2007 by Easy Software Products, all rights reserved. * * These coded instructions, statements, and computer programs are the @@ -546,6 +546,9 @@ httpCredentialsGetTrust( if ((secCert = http_cdsa_create_credential((http_credential_t *)cupsArrayFirst(credentials))) == NULL) return (HTTP_TRUST_UNKNOWN); + if (cg->any_root < 0) + _cupsSetDefaults(); + /* * Look this common name up in the default keychains... */ |