From: Michael R Sweet <michael.r.sweet@gmail.com>
Date: Mon, 14 Dec 2020 16:12:51 +0000 (-0500)
Subject: With GNU TLS, generated certificates were incorrectly placed in $HOME for the
X-Git-Tag: v2.3.3op2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dcb99cda9112f6c79fd6345bb9a0cd30776d3d28;p=thirdparty%2Fcups.git

With GNU TLS, generated certificates were incorrectly placed in $HOME for the
root UID.  They should be in /etc/cups (ServerRoot).
---

diff --git a/CHANGES-OPENPRINTING.md b/CHANGES-OPENPRINTING.md
index 25904fe330..f245d74283 100644
--- a/CHANGES-OPENPRINTING.md
+++ b/CHANGES-OPENPRINTING.md
@@ -8,6 +8,7 @@ Changes in CUPS v2.3.3op2
 - Fixed duplicate ColorModel entries for AirPrint printers (Issue 59)
 - Fixed directory/permission defaults for Debian kfreebsd-based systems
   (Issue #60, Issue #61)
+- Root certificates were incorrectly stored in "~/.cups/ssl".
 
 
 Changes in CUPS v2.3.3op1
diff --git a/cups/tls-gnutls.c b/cups/tls-gnutls.c
index 329cc0eb42..4850383e10 100644
--- a/cups/tls-gnutls.c
+++ b/cups/tls-gnutls.c
@@ -1,6 +1,7 @@
 /*
  * TLS support code for CUPS using GNU TLS.
  *
+ * Copyright © 2020 by Michael R Sweet
  * Copyright © 2007-2019 by Apple Inc.
  * Copyright © 1997-2007 by Easy Software Products, all rights reserved.
  *
@@ -939,7 +940,7 @@ http_gnutls_default_path(char   *buffer,/* I - Path buffer */
 					/* Pointer to library globals */
 
 
-  if (cg->home)
+  if (cg->home && getuid())
   {
     snprintf(buffer, bufsize, "%s/.cups", cg->home);
     if (access(buffer, 0))