]>
Commit | Line | Data |
---|---|---|
c9cc687c | 1 | diff -urN cups-1.1.7.old/conf/cupsd.conf cups-1.1.7/conf/cupsd.conf |
2 | --- cups-1.1.7.old/conf/cupsd.conf Fri May 18 16:07:37 2001 | |
23db0460 | 3 | +++ cups-1.1.7/conf/cupsd.conf.in Fri May 18 16:50:40 2001 |
c9cc687c | 4 | @@ -257,6 +257,9 @@ |
5 | # default IPP port of 631. It changes users whenever an external | |
6 | # program is run... | |
7 | # | |
8 | +# If you want to set a user different than 'lp', make sure you | |
9 | +# also set the TempDir configuration variable to a user-writable | |
10 | +# directory !! | |
11 | ||
12 | #User lp | |
13 | #Group sys | |
14 | diff -urN cups-1.1.7.old/cups/tempfile.c cups-1.1.7/cups/tempfile.c | |
15 | --- cups-1.1.7.old/cups/tempfile.c Fri May 18 16:07:37 2001 | |
16 | +++ cups-1.1.7/cups/tempfile.c Fri May 18 16:51:07 2001 | |
17 | @@ -82,6 +82,7 @@ | |
18 | #ifdef WIN32 | |
19 | GetTempPath(sizeof(tmpdir), tmpdir); | |
20 | #else | |
21 | + unsetenv("TMPDIR"); | |
22 | if ((tmpdir = getenv("TMPDIR")) == NULL) | |
23 | { | |
24 | /* | |
25 | diff -urN cups-1.1.7.old/pdftops/gfile.cxx cups-1.1.7/pdftops/gfile.cxx | |
26 | --- cups-1.1.7.old/pdftops/gfile.cxx Fri May 18 16:07:39 2001 | |
27 | +++ cups-1.1.7/pdftops/gfile.cxx Fri May 18 16:51:20 2001 | |
28 | @@ -504,6 +504,7 @@ | |
29 | fd = open((*name)->getCString(), O_WRONLY | O_CREAT | O_EXCL, 0600); | |
30 | } else { | |
31 | # if HAVE_MKSTEMP | |
32 | + unsetenv("TMPDIR"); | |
33 | if ((s = getenv("TMPDIR"))) { | |
34 | *name = new GString(s); | |
35 | } else { | |
36 | diff -urN cups-1.1.7.old/scheduler/client.c cups-1.1.7/scheduler/client.c | |
37 | --- cups-1.1.7.old/scheduler/client.c Fri May 18 16:07:38 2001 | |
38 | +++ cups-1.1.7/scheduler/client.c Fri May 18 16:48:45 2001 | |
39 | @@ -2038,6 +2038,11 @@ | |
40 | * Running as root, so change to non-priviledged user... | |
41 | */ | |
42 | ||
43 | + // in modern systems, TMPDIR and TMP equal $HOME/tmp, | |
44 | + // and /root/tmp is of no use for non-root processes | |
45 | + unsetenv("TMPDIR"); | |
46 | + unsetenv("TMP"); | |
47 | + | |
48 | if (setgid(Group)) | |
49 | exit(errno); | |
50 | ||
51 | diff -urN cups-1.1.7.old/scheduler/conf.c cups-1.1.7/scheduler/conf.c | |
52 | --- cups-1.1.7.old/scheduler/conf.c Fri May 18 16:07:38 2001 | |
53 | +++ cups-1.1.7/scheduler/conf.c Fri May 18 16:49:08 2001 | |
54 | @@ -232,6 +232,7 @@ | |
55 | ||
56 | strcpy(RIPCache, "8m"); | |
57 | ||
58 | + unsetenv("TMPDIR"); | |
59 | if (getenv("TMPDIR") == NULL) | |
60 | strcpy(TempDir, CUPS_REQUESTS "/tmp"); | |
61 | else | |
62 | diff -urN cups-1.1.7.old/scheduler/dirsvc.c cups-1.1.7/scheduler/dirsvc.c | |
63 | --- cups-1.1.7.old/scheduler/dirsvc.c Fri May 18 16:07:38 2001 | |
64 | +++ cups-1.1.7/scheduler/dirsvc.c Fri May 18 16:48:45 2001 | |
65 | @@ -899,6 +899,11 @@ | |
66 | * Running as root, so change to non-priviledged user... | |
67 | */ | |
68 | ||
69 | + // in modern systems, TMPDIR and TMP equal $HOME/tmp, | |
70 | + // and /root/tmp is of no use for non-root processes | |
71 | + unsetenv("TMPDIR"); | |
72 | + unsetenv("TMP"); | |
73 | + | |
74 | if (setgid(Group)) | |
75 | exit(errno); | |
76 | ||
77 | diff -urN cups-1.1.7.old/scheduler/job.c cups-1.1.7/scheduler/job.c | |
78 | --- cups-1.1.7.old/scheduler/job.c Fri May 18 16:07:38 2001 | |
79 | +++ cups-1.1.7/scheduler/job.c Fri May 18 16:48:45 2001 | |
80 | @@ -2816,6 +2816,11 @@ | |
81 | * Running as root, so change to non-priviledged user... | |
82 | */ | |
83 | ||
84 | + // in modern systems, TMPDIR and TMP equal $HOME/tmp, | |
85 | + // and /root/tmp is of no use for non-root processes | |
86 | + unsetenv("TMPDIR"); | |
87 | + unsetenv("TMP"); | |
88 | + | |
89 | if (setgid(Group)) | |
90 | exit(errno); | |
91 | ||
92 | diff -urN cups-1.1.7.old/scheduler/server.c cups-1.1.7/scheduler/server.c | |
93 | --- cups-1.1.7.old/scheduler/server.c Fri May 18 16:07:38 2001 | |
94 | +++ cups-1.1.7/scheduler/server.c Fri May 18 16:48:45 2001 | |
95 | @@ -92,6 +92,11 @@ | |
96 | ||
97 | if (RunAsUser) | |
98 | { | |
99 | + // in modern systems, TMPDIR and TMP equal $HOME/tmp, | |
100 | + // and /root/tmp is of no use for non-root processes | |
101 | + unsetenv("TMPDIR"); | |
102 | + unsetenv("TMP"); | |
103 | + | |
104 | setgid(Group); | |
105 | setgroups(0, NULL); | |
106 | setuid(User); |