|
874
|
1 |
diff -ru PolicyKit-0.7.orig/config.h.in PolicyKit-0.7/config.h.in
|
|
|
2 |
--- PolicyKit-0.7.orig/config.h.in Sat Dec 1 09:43:35 2007
|
|
|
3 |
+++ PolicyKit-0.7/config.h.in Fri Jan 25 14:44:43 2008
|
|
|
4 |
@@ -54,6 +54,9 @@
|
|
|
5 |
/* SELinux support */
|
|
|
6 |
#undef HAVE_SELINUX
|
|
|
7 |
|
|
|
8 |
+/* Is this a Solaris system? */
|
|
|
9 |
+#undef HAVE_SOLARIS
|
|
|
10 |
+
|
|
|
11 |
/* Define to 1 if you have the <stdint.h> header file. */
|
|
|
12 |
#undef HAVE_STDINT_H
|
|
|
13 |
|
|
|
14 |
diff -ru PolicyKit-0.7.orig/configure.in PolicyKit-0.7/configure.in
|
|
|
15 |
--- PolicyKit-0.7.orig/configure.in Mon Nov 26 04:43:40 2007
|
|
|
16 |
+++ PolicyKit-0.7/configure.in Fri Jan 25 14:43:04 2008
|
|
|
17 |
@@ -370,7 +370,7 @@
|
|
|
18 |
|
|
|
19 |
AC_SUBST(PAM_MODULE_DIR)
|
|
|
20 |
|
|
|
21 |
-AC_ARG_WITH(os-type, [ --with-os-type=<os> distribution or OS (redhat/suse/gentoo/pardus)])
|
|
|
22 |
+AC_ARG_WITH(os-type, [ --with-os-type=<os> distribution or OS (redhat/suse/gentoo/pardus/solaris)])
|
|
|
23 |
|
|
|
24 |
#### Check our operating system (distro-tweaks required)
|
|
|
25 |
if test "z$with_os_type" = "z"; then
|
|
|
26 |
@@ -395,6 +395,8 @@
|
|
|
27 |
with_os_type=gentoo
|
|
|
28 |
elif test x$operating_system = xpardus ; then
|
|
|
29 |
with_os_type=pardus
|
|
|
30 |
+ elif test x$operating_system = xsolaris ; then
|
|
|
31 |
+ with_os_type=solaris
|
|
|
32 |
else
|
|
|
33 |
with_os_type=unknown
|
|
|
34 |
fi
|
|
|
35 |
@@ -406,6 +408,7 @@
|
|
|
36 |
AM_CONDITIONAL(OS_TYPE_SUSE, test x$with_os_type = xsuse, [Running on SUSE OS'es])
|
|
|
37 |
AM_CONDITIONAL(OS_TYPE_GENTOO, test x$with_os_type = xgentoo, [Running on Gentoo OS'es])
|
|
|
38 |
AM_CONDITIONAL(OS_TYPE_PARDUS, test x$with_os_type = xpardus, [Running on Pardus OS'es])
|
|
|
39 |
+AM_CONDITIONAL(OS_TYPE_SALARIS, test x$with_os_type = xsolaris, [Running os Solaris OS'es])
|
|
|
40 |
|
|
|
41 |
AC_ARG_WITH(pam-include, [ --with-pam-include=<file> pam file to include])
|
|
|
42 |
|
|
|
43 |
@@ -420,7 +423,7 @@
|
|
|
44 |
PAM_FILE_INCLUDE_ACCOUNT=system-auth
|
|
|
45 |
PAM_FILE_INCLUDE_PASSWORD=system-auth
|
|
|
46 |
PAM_FILE_INCLUDE_SESSION=system-auth
|
|
|
47 |
-elif test x$with_os_type = xsuse ; then
|
|
|
48 |
+elif test x$with_os_type = xsuse -o x$with_os_type - xsolaris ; then
|
|
|
49 |
PAM_FILE_INCLUDE_AUTH=common-auth
|
|
|
50 |
PAM_FILE_INCLUDE_ACCOUNT=common-account
|
|
|
51 |
PAM_FILE_INCLUDE_PASSWORD=common-password
|
|
|
52 |
@@ -441,6 +444,17 @@
|
|
|
53 |
AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_PASSWORD, "$PAM_FILE_INCLUDE_PASSWORD", [pam file password])
|
|
|
54 |
AC_DEFINE_UNQUOTED(PAM_FILE_INCLUDE_SESSION, "$PAM_FILE_INCLUDE_SESSION", [pam file session])
|
|
|
55 |
|
|
|
56 |
+dnl ---------------------------------------------------------------------------
|
|
|
57 |
+dnl - check OS
|
|
|
58 |
+dnl ---------------------------------------------------------------------------
|
|
|
59 |
+case "$host_os" in
|
|
|
60 |
+ *linux*)
|
|
|
61 |
+ ;;
|
|
|
62 |
+ *solaris*)
|
|
|
63 |
+ AC_DEFINE([HAVE_SOLARIS], 1, [Is this a Solaris system?])
|
|
|
64 |
+ ;;
|
|
|
65 |
+esac
|
|
|
66 |
+
|
|
|
67 |
# ********************
|
|
|
68 |
# Internationalisation
|
|
|
69 |
# ********************
|
|
|
70 |
diff -ru PolicyKit-0.7.orig/src/kit/kit-file.h PolicyKit-0.7/src/kit/kit-file.h
|
|
|
71 |
--- PolicyKit-0.7.orig/src/kit/kit-file.h Thu Nov 29 05:32:39 2007
|
|
|
72 |
+++ PolicyKit-0.7/src/kit/kit-file.h Fri Jan 25 15:15:28 2008
|
|
|
73 |
@@ -35,6 +35,9 @@
|
|
|
74 |
#define KIT_FILE_H
|
|
|
75 |
|
|
|
76 |
#include <kit/kit.h>
|
|
|
77 |
+#ifdef HAVE_SOLARIS
|
|
|
78 |
+#include <sys/types.h>
|
|
|
79 |
+#endif
|
|
|
80 |
|
|
|
81 |
KIT_BEGIN_DECLS
|
|
|
82 |
|
|
|
83 |
diff -ru PolicyKit-0.7.orig/src/kit/kit-message.h PolicyKit-0.7/src/kit/kit-message.h
|
|
|
84 |
--- PolicyKit-0.7.orig/src/kit/kit-message.h Thu Nov 29 05:31:41 2007
|
|
|
85 |
+++ PolicyKit-0.7/src/kit/kit-message.h Fri Jan 25 15:02:22 2008
|
|
|
86 |
@@ -38,8 +38,13 @@
|
|
|
87 |
|
|
|
88 |
KIT_BEGIN_DECLS
|
|
|
89 |
|
|
|
90 |
+#ifdef __sun
|
|
|
91 |
+void kit_debug (const char *format, ...);
|
|
|
92 |
+void kit_warning (const char *format, ...);
|
|
|
93 |
+#else
|
|
|
94 |
void kit_debug (const char *format, ...) __attribute__((__format__ (__printf__, 1, 2)));
|
|
|
95 |
void kit_warning (const char *format, ...) __attribute__((__format__ (__printf__, 1, 2)));
|
|
|
96 |
+#endif
|
|
|
97 |
|
|
|
98 |
KIT_END_DECLS
|
|
|
99 |
|
|
|
100 |
diff -ru PolicyKit-0.7.orig/src/kit/kit-spawn.c PolicyKit-0.7/src/kit/kit-spawn.c
|
|
|
101 |
--- PolicyKit-0.7.orig/src/kit/kit-spawn.c Thu Nov 29 05:32:22 2007
|
|
|
102 |
+++ PolicyKit-0.7/src/kit/kit-spawn.c Fri Jan 25 15:35:28 2008
|
|
|
103 |
@@ -156,9 +156,9 @@
|
|
|
104 |
* @flags: A combination of flags from #KitSpawnFlags
|
|
|
105 |
* @argv: #NULL terminated argument vector
|
|
|
106 |
* @envp: #NULL terminated environment or #NULL to inherit parents;
|
|
|
107 |
- * @stdin: String to write to stdin of child or #NULL
|
|
|
108 |
- * @stdout: Return location for stdout from child or #NULL. Free with kit_free().
|
|
|
109 |
- * @stderr: Return location for stderr from child or #NULL. Free with kit_free().
|
|
|
110 |
+ * @stdinp: String to write to stdin of child or #NULL
|
|
|
111 |
+ * @stdoutp: Return location for stdout from child or #NULL. Free with kit_free().
|
|
|
112 |
+ * @stderrp: Return location for stderr from child or #NULL. Free with kit_free().
|
|
|
113 |
* @out_exit_status: Return location for exit status
|
|
|
114 |
*
|
|
|
115 |
* Executes a child process and waits for the child process to exit
|
|
|
116 |
@@ -175,9 +175,9 @@
|
|
|
117 |
KitSpawnFlags flags,
|
|
|
118 |
char **argv,
|
|
|
119 |
char **envp,
|
|
|
120 |
- char *stdin,
|
|
|
121 |
- char **stdout,
|
|
|
122 |
- char **stderr,
|
|
|
123 |
+ char *stdinp,
|
|
|
124 |
+ char **stdoutp,
|
|
|
125 |
+ char **stderrp,
|
|
|
126 |
int *out_exit_status)
|
|
|
127 |
{
|
|
|
128 |
kit_bool_t ret;
|
|
|
129 |
@@ -191,28 +191,28 @@
|
|
|
130 |
|
|
|
131 |
kit_return_val_if_fail (argv != NULL, FALSE);
|
|
|
132 |
kit_return_val_if_fail (out_exit_status != NULL, FALSE);
|
|
|
133 |
- kit_return_val_if_fail (! ((flags & KIT_SPAWN_CHILD_INHERITS_STDIN) && stdin != NULL), FALSE);
|
|
|
134 |
- kit_return_val_if_fail (! ((flags & KIT_SPAWN_STDOUT_TO_DEV_NULL) && stdout != NULL), FALSE);
|
|
|
135 |
- kit_return_val_if_fail (! ((flags & KIT_SPAWN_STDERR_TO_DEV_NULL) && stderr != NULL), FALSE);
|
|
|
136 |
+ kit_return_val_if_fail (! ((flags & KIT_SPAWN_CHILD_INHERITS_STDIN) && stdinp != NULL), FALSE);
|
|
|
137 |
+ kit_return_val_if_fail (! ((flags & KIT_SPAWN_STDOUT_TO_DEV_NULL) && stdoutp != NULL), FALSE);
|
|
|
138 |
+ kit_return_val_if_fail (! ((flags & KIT_SPAWN_STDERR_TO_DEV_NULL) && stderrp != NULL), FALSE);
|
|
|
139 |
|
|
|
140 |
- if (stdout != NULL)
|
|
|
141 |
- *stdout = NULL;
|
|
|
142 |
- if (stderr != NULL)
|
|
|
143 |
- *stderr = NULL;
|
|
|
144 |
+ if (stdoutp != NULL)
|
|
|
145 |
+ *stdoutp = NULL;
|
|
|
146 |
+ if (stderrp != NULL)
|
|
|
147 |
+ *stderrp = NULL;
|
|
|
148 |
|
|
|
149 |
- if (stdin != NULL) {
|
|
|
150 |
+ if (stdinp != NULL) {
|
|
|
151 |
if (pipe (stdin_pipe) != 0) {
|
|
|
152 |
goto out;
|
|
|
153 |
}
|
|
|
154 |
}
|
|
|
155 |
|
|
|
156 |
- if (stdout != NULL) {
|
|
|
157 |
+ if (stdoutp != NULL) {
|
|
|
158 |
if (pipe (stdout_pipe) != 0) {
|
|
|
159 |
goto out;
|
|
|
160 |
}
|
|
|
161 |
}
|
|
|
162 |
|
|
|
163 |
- if (stderr != NULL) {
|
|
|
164 |
+ if (stderrp != NULL) {
|
|
|
165 |
if (pipe (stderr_pipe) != 0) {
|
|
|
166 |
goto out;
|
|
|
167 |
}
|
|
|
168 |
@@ -260,9 +260,9 @@
|
|
|
169 |
}
|
|
|
170 |
}
|
|
|
171 |
|
|
|
172 |
- /* set stdin, stdout and stderr */
|
|
|
173 |
+ /* set stdinp, stdoutp and stderrp */
|
|
|
174 |
|
|
|
175 |
- if (stdin != NULL) {
|
|
|
176 |
+ if (stdinp != NULL) {
|
|
|
177 |
if (_sane_dup2 (stdin_pipe[0], 0) < 0) {
|
|
|
178 |
exit (128 + errno);
|
|
|
179 |
}
|
|
|
180 |
@@ -272,7 +272,7 @@
|
|
|
181 |
}
|
|
|
182 |
}
|
|
|
183 |
|
|
|
184 |
- if (stdout != NULL) {
|
|
|
185 |
+ if (stdoutp != NULL) {
|
|
|
186 |
if (_sane_dup2 (stdout_pipe[1], 1) < 0) {
|
|
|
187 |
exit (128 + errno);
|
|
|
188 |
}
|
|
|
189 |
@@ -282,7 +282,7 @@
|
|
|
190 |
}
|
|
|
191 |
}
|
|
|
192 |
|
|
|
193 |
- if (stderr != NULL) {
|
|
|
194 |
+ if (stderrp != NULL) {
|
|
|
195 |
if (_sane_dup2 (stderr_pipe[1], 2) < 0) {
|
|
|
196 |
exit (128 + errno);
|
|
|
197 |
}
|
|
|
198 |
@@ -322,7 +322,7 @@
|
|
|
199 |
close (stderr_pipe[1]);
|
|
|
200 |
}
|
|
|
201 |
|
|
|
202 |
- wp = stdin;
|
|
|
203 |
+ wp = stdinp;
|
|
|
204 |
|
|
|
205 |
while (stdin_pipe[1] != -1 || stdout_pipe[0] != -1 || stderr_pipe[0] != -1) {
|
|
|
206 |
int ret;
|
|
|
207 |
@@ -375,7 +375,7 @@
|
|
|
208 |
}
|
|
|
209 |
|
|
|
210 |
if (stdout_pipe[0] != -1) {
|
|
|
211 |
- num_read = _read_from (stdout_pipe[0], stdout);
|
|
|
212 |
+ num_read = _read_from (stdout_pipe[0], stdoutp);
|
|
|
213 |
if (num_read == 0) {
|
|
|
214 |
close (stdout_pipe[0]);
|
|
|
215 |
stdout_pipe[0] = -1;
|
|
|
216 |
@@ -385,7 +385,7 @@
|
|
|
217 |
}
|
|
|
218 |
|
|
|
219 |
if (stderr_pipe[0] != -1) {
|
|
|
220 |
- num_read = _read_from (stderr_pipe[0], stderr);
|
|
|
221 |
+ num_read = _read_from (stderr_pipe[0], stderrp);
|
|
|
222 |
if (num_read == 0) {
|
|
|
223 |
close (stderr_pipe[0]);
|
|
|
224 |
stderr_pipe[0] = -1;
|
|
|
225 |
@@ -424,13 +424,13 @@
|
|
|
226 |
close (stderr_pipe[0]);
|
|
|
227 |
|
|
|
228 |
if (!ret) {
|
|
|
229 |
- if (stdout != NULL) {
|
|
|
230 |
- kit_free (*stdout);
|
|
|
231 |
- *stdout = NULL;
|
|
|
232 |
+ if (stdoutp != NULL) {
|
|
|
233 |
+ kit_free (*stdoutp);
|
|
|
234 |
+ *stdoutp = NULL;
|
|
|
235 |
}
|
|
|
236 |
- if (stderr != NULL) {
|
|
|
237 |
- kit_free (*stderr);
|
|
|
238 |
- *stderr = NULL;
|
|
|
239 |
+ if (stderrp != NULL) {
|
|
|
240 |
+ kit_free (*stderrp);
|
|
|
241 |
+ *stderrp = NULL;
|
|
|
242 |
}
|
|
|
243 |
}
|
|
|
244 |
|
|
|
245 |
@@ -483,8 +483,8 @@
|
|
|
246 |
"echo -n \"$value\"" "\n"
|
|
|
247 |
"exit 0" "\n";
|
|
|
248 |
char *argv[] = {"/tmp/kit-spawn-test", NULL};
|
|
|
249 |
- char *stdout;
|
|
|
250 |
- char *stderr;
|
|
|
251 |
+ char *stdoutp;
|
|
|
252 |
+ char *stderrp;
|
|
|
253 |
int exit_status;
|
|
|
254 |
struct stat statbuf;
|
|
|
255 |
|
|
|
256 |
@@ -495,14 +495,14 @@
|
|
|
257 |
argv,
|
|
|
258 |
NULL,
|
|
|
259 |
NULL,
|
|
|
260 |
- &stdout,
|
|
|
261 |
- &stderr,
|
|
|
262 |
+ &stdoutp,
|
|
|
263 |
+ &stderrp,
|
|
|
264 |
&exit_status)) {
|
|
|
265 |
kit_assert (WEXITSTATUS (exit_status) == 42);
|
|
|
266 |
- kit_assert (stdout != NULL && strcmp (stdout, "Hello World\n") == 0);
|
|
|
267 |
- kit_assert (stderr != NULL && strcmp (stderr, "Goodbye World\n") == 0);
|
|
|
268 |
- kit_free (stdout);
|
|
|
269 |
- kit_free (stderr);
|
|
|
270 |
+ kit_assert (stdoutp != NULL && strcmp (stdoutp, "Hello World\n") == 0);
|
|
|
271 |
+ kit_assert (stderrp != NULL && strcmp (stderrp, "Goodbye World\n") == 0);
|
|
|
272 |
+ kit_free (stdoutp);
|
|
|
273 |
+ kit_free (stderrp);
|
|
|
274 |
}
|
|
|
275 |
|
|
|
276 |
if (kit_spawn_sync ("/",
|
|
|
277 |
@@ -526,12 +526,12 @@
|
|
|
278 |
argv,
|
|
|
279 |
NULL,
|
|
|
280 |
NULL,
|
|
|
281 |
- &stdout,
|
|
|
282 |
- &stderr,
|
|
|
283 |
+ &stdoutp,
|
|
|
284 |
+ &stderrp,
|
|
|
285 |
&exit_status)) {
|
|
|
286 |
kit_assert (WEXITSTATUS (exit_status) == 43);
|
|
|
287 |
- kit_assert (stdout == NULL);
|
|
|
288 |
- kit_assert (stderr == NULL);
|
|
|
289 |
+ kit_assert (stdoutp == NULL);
|
|
|
290 |
+ kit_assert (stderrp == NULL);
|
|
|
291 |
}
|
|
|
292 |
|
|
|
293 |
kit_assert (unlink (path) == 0);
|
|
|
294 |
@@ -546,12 +546,12 @@
|
|
|
295 |
argv,
|
|
|
296 |
envp,
|
|
|
297 |
NULL,
|
|
|
298 |
- &stdout,
|
|
|
299 |
+ &stdoutp,
|
|
|
300 |
NULL,
|
|
|
301 |
&exit_status)) {
|
|
|
302 |
kit_assert (WEXITSTATUS (exit_status) == 0);
|
|
|
303 |
- kit_assert (stdout != NULL && strcmp (stdout, "some_value") == 0);
|
|
|
304 |
- kit_free (stdout);
|
|
|
305 |
+ kit_assert (stdoutp != NULL && strcmp (stdoutp, "some_value") == 0);
|
|
|
306 |
+ kit_free (stdoutp);
|
|
|
307 |
}
|
|
|
308 |
|
|
|
309 |
kit_assert (unlink (path) == 0);
|
|
|
310 |
@@ -606,12 +606,12 @@
|
|
|
311 |
argv,
|
|
|
312 |
NULL,
|
|
|
313 |
NULL,
|
|
|
314 |
- &stdout,
|
|
|
315 |
+ &stdoutp,
|
|
|
316 |
NULL,
|
|
|
317 |
&exit_status)) {
|
|
|
318 |
kit_assert (WEXITSTATUS (exit_status) == 0);
|
|
|
319 |
- kit_assert (stdout != NULL && strcmp (stdout, "/tmp\n") == 0);
|
|
|
320 |
- kit_free (stdout);
|
|
|
321 |
+ kit_assert (stdoutp != NULL && strcmp (stdoutp, "/tmp\n") == 0);
|
|
|
322 |
+ kit_free (stdoutp);
|
|
|
323 |
}
|
|
|
324 |
|
|
|
325 |
kit_assert (stat ("/usr", &statbuf) == 0 && S_ISDIR (statbuf.st_mode));
|
|
|
326 |
@@ -620,12 +620,12 @@
|
|
|
327 |
argv,
|
|
|
328 |
NULL,
|
|
|
329 |
NULL,
|
|
|
330 |
- &stdout,
|
|
|
331 |
+ &stdoutp,
|
|
|
332 |
NULL,
|
|
|
333 |
&exit_status)) {
|
|
|
334 |
kit_assert (WEXITSTATUS (exit_status) == 0);
|
|
|
335 |
- kit_assert (stdout != NULL && strcmp (stdout, "/usr\n") == 0);
|
|
|
336 |
- kit_free (stdout);
|
|
|
337 |
+ kit_assert (stdoutp != NULL && strcmp (stdoutp, "/usr\n") == 0);
|
|
|
338 |
+ kit_free (stdoutp);
|
|
|
339 |
}
|
|
|
340 |
|
|
|
341 |
kit_assert (unlink (path) == 0);
|
|
|
342 |
@@ -650,12 +650,12 @@
|
|
|
343 |
argv,
|
|
|
344 |
NULL,
|
|
|
345 |
"foobar0\nfoobar1",
|
|
|
346 |
- &stdout,
|
|
|
347 |
+ &stdoutp,
|
|
|
348 |
NULL,
|
|
|
349 |
&exit_status)) {
|
|
|
350 |
kit_assert (WEXITSTATUS (exit_status) == 0);
|
|
|
351 |
- kit_assert (stdout != NULL && strcmp (stdout, "foobar0 foobar1") == 0);
|
|
|
352 |
- kit_free (stdout);
|
|
|
353 |
+ kit_assert (stdoutp != NULL && strcmp (stdoutp, "foobar0 foobar1") == 0);
|
|
|
354 |
+ kit_free (stdoutp);
|
|
|
355 |
}
|
|
|
356 |
|
|
|
357 |
kit_assert (unlink (path) == 0);
|
|
|
358 |
diff -ru PolicyKit-0.7.orig/src/kit/kit-spawn.h PolicyKit-0.7/src/kit/kit-spawn.h
|
|
|
359 |
--- PolicyKit-0.7.orig/src/kit/kit-spawn.h Thu Nov 29 05:31:32 2007
|
|
|
360 |
+++ PolicyKit-0.7/src/kit/kit-spawn.h Fri Jan 25 15:00:55 2008
|
|
|
361 |
@@ -57,9 +57,9 @@
|
|
|
362 |
KitSpawnFlags flags,
|
|
|
363 |
char **argv,
|
|
|
364 |
char **envp,
|
|
|
365 |
- char *stdin,
|
|
|
366 |
- char **stdout,
|
|
|
367 |
- char **stderr,
|
|
|
368 |
+ char *stdinp,
|
|
|
369 |
+ char **stdoutp,
|
|
|
370 |
+ char **stderrp,
|
|
|
371 |
int *out_exit_status);
|
|
|
372 |
|
|
|
373 |
KIT_END_DECLS
|
|
|
374 |
diff -ru PolicyKit-0.7.orig/src/kit/kit-string.c PolicyKit-0.7/src/kit/kit-string.c
|
|
|
375 |
--- PolicyKit-0.7.orig/src/kit/kit-string.c Thu Dec 6 10:25:37 2007
|
|
|
376 |
+++ PolicyKit-0.7/src/kit/kit-string.c Fri Jan 25 16:18:03 2008
|
|
|
377 |
@@ -127,6 +127,26 @@
|
|
|
378 |
|
|
|
379 |
#endif /* KIT_BUILD_TESTS */
|
|
|
380 |
|
|
|
381 |
+#ifdef HAVE_SOLARIS
|
|
|
382 |
+int vasprintf(char **strp, const char *fmt, va_list ap)
|
|
|
383 |
+{
|
|
|
384 |
+ int size;
|
|
|
385 |
+ va_list ap2;
|
|
|
386 |
+ char s;
|
|
|
387 |
+
|
|
|
388 |
+ *strp = NULL;
|
|
|
389 |
+ va_copy(ap2, ap);
|
|
|
390 |
+ size = vsnprintf(&s, 1, fmt, ap2);
|
|
|
391 |
+ va_end(ap2);
|
|
|
392 |
+ *strp = malloc(size + 1);
|
|
|
393 |
+ if (!*strp)
|
|
|
394 |
+ return -1;
|
|
|
395 |
+ vsnprintf(*strp, size + 1, fmt, ap);
|
|
|
396 |
+
|
|
|
397 |
+ return size;
|
|
|
398 |
+}
|
|
|
399 |
+#endif
|
|
|
400 |
+
|
|
|
401 |
/**
|
|
|
402 |
* kit_strdup_printf:
|
|
|
403 |
* @format: sprintf(3) format string
|
|
|
404 |
diff -ru PolicyKit-0.7.orig/src/kit/kit-string.h PolicyKit-0.7/src/kit/kit-string.h
|
|
|
405 |
--- PolicyKit-0.7.orig/src/kit/kit-string.h Sat Dec 1 07:22:06 2007
|
|
|
406 |
+++ PolicyKit-0.7/src/kit/kit-string.h Fri Jan 25 14:47:39 2008
|
|
|
407 |
@@ -40,7 +40,11 @@
|
|
|
408 |
|
|
|
409 |
char *kit_strdup (const char *s);
|
|
|
410 |
char *kit_strndup (const char *s, size_t n);
|
|
|
411 |
+#ifdef __sun
|
|
|
412 |
+char *kit_strdup_printf (const char *format, ...);
|
|
|
413 |
+#else
|
|
|
414 |
char *kit_strdup_printf (const char *format, ...) __attribute__((__format__ (__printf__, 1, 2)));
|
|
|
415 |
+#endif
|
|
|
416 |
char *kit_strdup_vprintf (const char *format, va_list args);
|
|
|
417 |
char *kit_str_append (char *s, const char *s2);
|
|
|
418 |
|
|
|
419 |
diff -ru PolicyKit-0.7.orig/src/kit/kit-test.c PolicyKit-0.7/src/kit/kit-test.c
|
|
|
420 |
--- PolicyKit-0.7.orig/src/kit/kit-test.c Thu Nov 29 05:32:34 2007
|
|
|
421 |
+++ PolicyKit-0.7.good/src/kit/kit-test.c Fri Jan 25 18:30:16 2008
|
|
|
422 |
@@ -27,8 +27,15 @@
|
|
|
423 |
*
|
|
|
424 |
**************************************************************************/
|
|
|
425 |
|
|
|
426 |
+#ifdef HAVE_CONFIG_H
|
|
|
427 |
+# include <config.h>
|
|
|
428 |
+#endif
|
|
|
429 |
+
|
|
|
430 |
#include <stdio.h>
|
|
|
431 |
#include <stdlib.h>
|
|
|
432 |
+#ifdef HAVE_SOLARIS
|
|
|
433 |
+#include <sys/types.h>
|
|
|
434 |
+#endif
|
|
|
435 |
#include <kit/kit-test.h>
|
|
|
436 |
#include <kit/kit-memory.h>
|
|
|
437 |
|
|
|
438 |
|
|
|
439 |
diff -ru PolicyKit-0.7.orig/src/kit/kit.h PolicyKit-0.7/src/kit/kit.h
|
|
|
440 |
--- PolicyKit-0.7.orig/src/kit/kit.h Thu Nov 29 12:59:43 2007
|
|
|
441 |
+++ PolicyKit-0.7/src/kit/kit.h Fri Jan 25 15:17:53 2008
|
|
|
442 |
@@ -72,6 +72,9 @@
|
|
|
443 |
|
|
|
444 |
void kit_print_backtrace (void);
|
|
|
445 |
|
|
|
446 |
+#ifdef HAVE_SOLARIS
|
|
|
447 |
+#define __PRETTY_FUNCTION__ __func__
|
|
|
448 |
+#endif
|
|
|
449 |
/**
|
|
|
450 |
* kit_assert:
|
|
|
451 |
* @expr: expression
|
|
|
452 |
@@ -136,6 +139,9 @@
|
|
|
453 |
|
|
|
454 |
#define _KIT_INSIDE_KIT_H 1
|
|
|
455 |
|
|
|
456 |
+#ifdef HAVE_SOLARIS
|
|
|
457 |
+#include <sys/types.h>
|
|
|
458 |
+#endif
|
|
|
459 |
#include <kit/kit-memory.h>
|
|
|
460 |
#include <kit/kit-string.h>
|
|
|
461 |
#include <kit/kit-list.h>
|
|
|
462 |
diff -ru PolicyKit-0.7.orig/src/polkit/polkit-config.c PolicyKit-0.7/src/polkit/polkit-config.c
|
|
|
463 |
--- PolicyKit-0.7.orig/src/polkit/polkit-config.c Thu Nov 29 11:21:19 2007
|
|
|
464 |
+++ PolicyKit-0.7/src/polkit/polkit-config.c Fri Jan 25 15:53:24 2008
|
|
|
465 |
@@ -39,7 +39,12 @@
|
|
|
466 |
#include <grp.h>
|
|
|
467 |
#include <unistd.h>
|
|
|
468 |
#include <errno.h>
|
|
|
469 |
+#ifdef HAVE_SOLARIS
|
|
|
470 |
+#include <port.h>
|
|
|
471 |
+#include <sys/stat.h>
|
|
|
472 |
+#else
|
|
|
473 |
#include <sys/inotify.h>
|
|
|
474 |
+#endif
|
|
|
475 |
#include <regex.h>
|
|
|
476 |
#include <syslog.h>
|
|
|
477 |
#include <regex.h>
|
|
|
478 |
diff -ru PolicyKit-0.7.orig/src/polkit/polkit-context.c PolicyKit-0.7/src/polkit/polkit-context.c
|
|
|
479 |
--- PolicyKit-0.7.orig/src/polkit/polkit-context.c Wed Dec 5 09:22:41 2007
|
|
|
480 |
+++ PolicyKit-0.7/src/polkit/polkit-context.c Fri Jan 25 15:48:51 2008
|
|
|
481 |
@@ -39,7 +39,12 @@
|
|
|
482 |
#include <grp.h>
|
|
|
483 |
#include <unistd.h>
|
|
|
484 |
#include <errno.h>
|
|
|
485 |
+#ifdef HAVE_SOLARIS
|
|
|
486 |
+#include <port.h>
|
|
|
487 |
+#include <sys/stat.h>
|
|
|
488 |
+#else
|
|
|
489 |
#include <sys/inotify.h>
|
|
|
490 |
+#endif
|
|
|
491 |
#include <syslog.h>
|
|
|
492 |
|
|
|
493 |
#include "polkit-config.h"
|
|
|
494 |
@@ -153,7 +158,60 @@
|
|
|
495 |
|
|
|
496 |
/* NOTE: we don't load the configuration file until it's needed */
|
|
|
497 |
|
|
|
498 |
+#ifdef HAVE_SOLARIS
|
|
|
499 |
if (pk_context->io_add_watch_func != NULL) {
|
|
|
500 |
+ pk_context->inotify_fd = port_create ();
|
|
|
501 |
+ if (pk_context->inotify_fd < 0) {
|
|
|
502 |
+ _pk_debug ("failed to port_create: %s", strerror (errno));
|
|
|
503 |
+ /* TODO: set error */
|
|
|
504 |
+ goto error;
|
|
|
505 |
+ }
|
|
|
506 |
+
|
|
|
507 |
+ /* Watch the /etc/PolicyKit/PolicyKit.conf file */
|
|
|
508 |
+ pk_context->inotify_config_wd = port_add_watch (pk_context->inotify_fd,
|
|
|
509 |
+ PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf",
|
|
|
510 |
+ FILE_MODIFIED | FILE_ATTRIB);
|
|
|
511 |
+ if (pk_context->inotify_config_wd < 0) {
|
|
|
512 |
+ _pk_debug ("failed to add watch on file '" PACKAGE_SYSCONF_DIR "/PolicyKit/PolicyKit.conf': %s",
|
|
|
513 |
+ strerror (errno));
|
|
|
514 |
+ /* TODO: set error */
|
|
|
515 |
+ goto error;
|
|
|
516 |
+ }
|
|
|
517 |
+
|
|
|
518 |
+ /* Watch the /usr/share/PolicyKit/policy directory */
|
|
|
519 |
+ pk_context->inotify_policy_wd = port_add_watch (pk_context->inotify_fd,
|
|
|
520 |
+ PACKAGE_DATA_DIR "/PolicyKit/policy",
|
|
|
521 |
+ FILE_MODIFIED | FILE_ATTRIB);
|
|
|
522 |
+ if (pk_context->inotify_policy_wd < 0) {
|
|
|
523 |
+ _pk_debug ("failed to add watch on directory '" PACKAGE_DATA_DIR "/PolicyKit/policy': %s",
|
|
|
524 |
+ strerror (errno));
|
|
|
525 |
+ /* TODO: set error */
|
|
|
526 |
+ goto error;
|
|
|
527 |
+ }
|
|
|
528 |
+
|
|
|
529 |
+#ifdef POLKIT_AUTHDB_DEFAULT
|
|
|
530 |
+ /* Watch the /var/lib/misc/PolicyKit.reload file */
|
|
|
531 |
+ pk_context->inotify_grant_perm_wd = port_add_watch (pk_context->inotify_fd,
|
|
|
532 |
+ PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload",
|
|
|
533 |
+ FILE_MODIFIED | FILE_ATTRIB);
|
|
|
534 |
+ if (pk_context->inotify_grant_perm_wd < 0) {
|
|
|
535 |
+ _pk_debug ("failed to add watch on file '" PACKAGE_LOCALSTATE_DIR "/lib/misc/PolicyKit.reload': %s",
|
|
|
536 |
+ strerror (errno));
|
|
|
537 |
+ /* TODO: set error */
|
|
|
538 |
+ goto error;
|
|
|
539 |
+ }
|
|
|
540 |
+#endif
|
|
|
541 |
+
|
|
|
542 |
+ pk_context->inotify_fd_watch_id = pk_context->io_add_watch_func (pk_context, pk_context->inotify_fd);
|
|
|
543 |
+ if (pk_context->inotify_fd_watch_id == 0) {
|
|
|
544 |
+ _pk_debug ("failed to add io watch");
|
|
|
545 |
+ /* TODO: set error */
|
|
|
546 |
+ goto error;
|
|
|
547 |
+ }
|
|
|
548 |
+ }
|
|
|
549 |
+
|
|
|
550 |
+#else
|
|
|
551 |
+ if (pk_context->io_add_watch_func != NULL) {
|
|
|
552 |
pk_context->inotify_fd = inotify_init ();
|
|
|
553 |
if (pk_context->inotify_fd < 0) {
|
|
|
554 |
_pk_debug ("failed to initialize inotify: %s", strerror (errno));
|
|
|
555 |
@@ -203,6 +261,7 @@
|
|
|
556 |
goto error;
|
|
|
557 |
}
|
|
|
558 |
}
|
|
|
559 |
+#endif
|
|
|
560 |
|
|
|
561 |
return TRUE;
|
|
|
562 |
error:
|
|
|
563 |
@@ -209,7 +268,72 @@
|
|
|
564 |
return FALSE;
|
|
|
565 |
}
|
|
|
566 |
|
|
|
567 |
+#ifdef HAVE_SOLARIS
|
|
|
568 |
+
|
|
|
569 |
+struct fileportinfo {
|
|
|
570 |
+ struct file_obj fobj;
|
|
|
571 |
+ int events;
|
|
|
572 |
+ int port;
|
|
|
573 |
+};
|
|
|
574 |
+
|
|
|
575 |
/**
|
|
|
576 |
+ * port_add_watch:
|
|
|
577 |
+ * @port: the port object
|
|
|
578 |
+ * @name: filename which will be added to the port
|
|
|
579 |
+ * @events: the event which will be watched for
|
|
|
580 |
+ *
|
|
|
581 |
+ * add file watch .
|
|
|
582 |
+ *
|
|
|
583 |
+ * Returns: the object
|
|
|
584 |
+ **/
|
|
|
585 |
+int
|
|
|
586 |
+port_add_watch (int port, const char *name, uint32_t events)
|
|
|
587 |
+{
|
|
|
588 |
+ struct fileportinfo *fpi;
|
|
|
589 |
+
|
|
|
590 |
+ if ( (fpi = kit_malloc (sizeof(struct fileportinfo)) ) == NULL ) {
|
|
|
591 |
+ _pk_debug ("Faile to kit_malloc!");
|
|
|
592 |
+ /* TODO: set error */
|
|
|
593 |
+ return -1;
|
|
|
594 |
+ }
|
|
|
595 |
+
|
|
|
596 |
+ fpi->fobj.fo_name = strdup (name);
|
|
|
597 |
+ fpi->events = events;
|
|
|
598 |
+ fpi->port = port;
|
|
|
599 |
+
|
|
|
600 |
+ if ( file_associate (fpi, events) < 0 ) {
|
|
|
601 |
+ _pk_debug ("Failed to associate with file %s: %s", fpi->fobj.fo_name, strerror (errno));
|
|
|
602 |
+ /* TODO: set error */
|
|
|
603 |
+ return -1;
|
|
|
604 |
+ }
|
|
|
605 |
+ return 0;
|
|
|
606 |
+}
|
|
|
607 |
+
|
|
|
608 |
+int
|
|
|
609 |
+file_associate (struct fileportinfo *fpinfo, int events)
|
|
|
610 |
+{
|
|
|
611 |
+ struct stat sb;
|
|
|
612 |
+
|
|
|
613 |
+ if ( stat (fpinfo->fobj.fo_name, &sb) == -1) {
|
|
|
614 |
+ _pk_debug ("Failed to stat file %s: %s", fpinfo->fobj.fo_name, strerror (errno));
|
|
|
615 |
+ /* TODO: set error */
|
|
|
616 |
+ return -1;
|
|
|
617 |
+ }
|
|
|
618 |
+
|
|
|
619 |
+ fpinfo->fobj.fo_atime = sb.st_atim;
|
|
|
620 |
+ fpinfo->fobj.fo_mtime = sb.st_mtim;
|
|
|
621 |
+ fpinfo->fobj.fo_ctime = sb.st_ctim;
|
|
|
622 |
+
|
|
|
623 |
+ if ( port_associate (fpinfo->port, PORT_SOURCE_FILE, (uintptr_t)&(fpinfo->fobj), events, (void *)fpinfo ) == -1) {
|
|
|
624 |
+ _pk_debug ("Failed to register file %s: %s", fpinfo->fobj.fo_name, strerror (errno));
|
|
|
625 |
+ /* TODO: set error */
|
|
|
626 |
+ return -1;
|
|
|
627 |
+ }
|
|
|
628 |
+ return 0;
|
|
|
629 |
+}
|
|
|
630 |
+#endif
|
|
|
631 |
+
|
|
|
632 |
+/**
|
|
|
633 |
* polkit_context_ref:
|
|
|
634 |
* @pk_context: the context object
|
|
|
635 |
*
|
|
|
636 |
@@ -296,7 +420,32 @@
|
|
|
637 |
|
|
|
638 |
config_changed = FALSE;
|
|
|
639 |
|
|
|
640 |
+#ifdef HAVE_SOLARIS
|
|
|
641 |
if (fd == pk_context->inotify_fd) {
|
|
|
642 |
+ port_event_t pe;
|
|
|
643 |
+ struct file_obj *fobjp;
|
|
|
644 |
+ struct fileportinfo *fpip;
|
|
|
645 |
+
|
|
|
646 |
+ while ( !port_get (fd, &pe, NULL) ) {
|
|
|
647 |
+ switch (pe.portev_source) {
|
|
|
648 |
+ case PORT_SOURCE_FILE:
|
|
|
649 |
+ fpip = (struct fileportinfo *)pe.portev_object;
|
|
|
650 |
+ fobjp = &fpip->fobj;
|
|
|
651 |
+ _pk_debug ("filename = %s, events = %d", fobjp->fo_name, pe.portev_events);
|
|
|
652 |
+ config_changed = TRUE;
|
|
|
653 |
+ _pk_debug ("Config changed");
|
|
|
654 |
+ file_associate ((struct fileportinfo *)pe.portev_object, pe.portev_events);
|
|
|
655 |
+ break;
|
|
|
656 |
+ default:
|
|
|
657 |
+ _pk_debug ("Event from unexpected source");
|
|
|
658 |
+ }
|
|
|
659 |
+ if ( config_changed )
|
|
|
660 |
+ break;
|
|
|
661 |
+ }
|
|
|
662 |
+ }
|
|
|
663 |
+
|
|
|
664 |
+#else
|
|
|
665 |
+ if (fd == pk_context->inotify_fd) {
|
|
|
666 |
/* size of the event structure, not counting name */
|
|
|
667 |
#define EVENT_SIZE (sizeof (struct inotify_event))
|
|
|
668 |
/* reasonable guess as to size of 1024 events */
|
|
|
669 |
@@ -327,6 +476,7 @@
|
|
|
670 |
i += EVENT_SIZE + event->len;
|
|
|
671 |
}
|
|
|
672 |
}
|
|
|
673 |
+#endif
|
|
|
674 |
|
|
|
675 |
if (config_changed) {
|
|
|
676 |
polkit_context_force_reload (pk_context);
|
|
|
677 |
diff -ru PolicyKit-0.7.orig/src/polkit/polkit-debug.h PolicyKit-0.7/src/polkit/polkit-debug.h
|
|
|
678 |
--- PolicyKit-0.7.orig/src/polkit/polkit-debug.h Thu Nov 29 05:28:01 2007
|
|
|
679 |
+++ PolicyKit-0.7/src/polkit/polkit-debug.h Fri Jan 25 15:38:43 2008
|
|
|
680 |
@@ -30,7 +30,11 @@
|
|
|
681 |
#ifndef POLKIT_DEBUG_H
|
|
|
682 |
#define POLKIT_DEBUG_H
|
|
|
683 |
|
|
|
684 |
+#ifdef __sun
|
|
|
685 |
+void _pk_debug (const char *format, ...);
|
|
|
686 |
+#else
|
|
|
687 |
void _pk_debug (const char *format, ...) __attribute__((__format__ (__printf__, 1, 2)));
|
|
|
688 |
+#endif
|
|
|
689 |
|
|
|
690 |
#endif /* POLKIT_DEBUG_H */
|
|
|
691 |
|
|
|
692 |
diff -ru PolicyKit-0.7.orig/src/polkit/polkit-error.h PolicyKit-0.7/src/polkit/polkit-error.h
|
|
|
693 |
--- PolicyKit-0.7.orig/src/polkit/polkit-error.h Thu Nov 29 05:25:31 2007
|
|
|
694 |
+++ PolicyKit-0.7/src/polkit/polkit-error.h Fri Jan 25 15:37:44 2008
|
|
|
695 |
@@ -89,7 +89,11 @@
|
|
|
696 |
PolKitErrorCode polkit_error_get_error_code (PolKitError *error);
|
|
|
697 |
const char *polkit_error_get_error_message (PolKitError *error);
|
|
|
698 |
void polkit_error_free (PolKitError *error);
|
|
|
699 |
+#ifdef __sun
|
|
|
700 |
+polkit_bool_t polkit_error_set_error (PolKitError **error, PolKitErrorCode error_code, const char *format, ...);
|
|
|
701 |
+#else
|
|
|
702 |
polkit_bool_t polkit_error_set_error (PolKitError **error, PolKitErrorCode error_code, const char *format, ...) __attribute__((__format__ (__printf__, 3, 4)));
|
|
|
703 |
+#endif
|
|
|
704 |
|
|
|
705 |
POLKIT_END_DECLS
|
|
|
706 |
|
|
|
707 |
diff -ru PolicyKit-0.7.orig/src/polkit/polkit-policy-cache.c PolicyKit-0.7/src/polkit/polkit-policy-cache.c
|
|
|
708 |
--- PolicyKit-0.7.orig/src/polkit/polkit-policy-cache.c Thu Nov 29 14:14:09 2007
|
|
|
709 |
+++ PolicyKit-0.7/src/polkit/polkit-policy-cache.c Fri Jan 25 15:50:48 2008
|
|
|
710 |
@@ -127,8 +127,10 @@
|
|
|
711 |
char *filename;
|
|
|
712 |
static const char suffix[] = ".policy";
|
|
|
713 |
|
|
|
714 |
+#ifndef HAVE_SOLARIS
|
|
|
715 |
if (d->d_type != DT_REG)
|
|
|
716 |
continue;
|
|
|
717 |
+#endif
|
|
|
718 |
|
|
|
719 |
filename = d->d_name;
|
|
|
720 |
name_len = strlen (filename);
|
|
|
721 |
diff -ru PolicyKit-0.7.orig/src/polkit/polkit-policy-file.c PolicyKit-0.7/src/polkit/polkit-policy-file.c
|
|
|
722 |
--- PolicyKit-0.7.orig/src/polkit/polkit-policy-file.c Thu Nov 29 11:30:38 2007
|
|
|
723 |
+++ PolicyKit-0.7/src/polkit/polkit-policy-file.c Fri Jan 25 16:21:09 2008
|
|
|
724 |
@@ -804,7 +804,27 @@
|
|
|
725 |
|
|
|
726 |
return FALSE;
|
|
|
727 |
}
|
|
|
728 |
+#ifdef HAVE_SOLARIS
|
|
|
729 |
+char *strndup ( const char *s, size_t n)
|
|
|
730 |
+{
|
|
|
731 |
+ size_t nAvail;
|
|
|
732 |
+ char *p;
|
|
|
733 |
|
|
|
734 |
+ if ( !s )
|
|
|
735 |
+ return 0;
|
|
|
736 |
+
|
|
|
737 |
+ if ( strlen(s) > n )
|
|
|
738 |
+ nAvail = n + 1;
|
|
|
739 |
+ else
|
|
|
740 |
+ nAvail = strlen(s) + 1;
|
|
|
741 |
+ p = malloc ( nAvail );
|
|
|
742 |
+ memcpy ( p, s, nAvail );
|
|
|
743 |
+ p[nAvail - 1] = '\0';
|
|
|
744 |
+
|
|
|
745 |
+ return p;
|
|
|
746 |
+}
|
|
|
747 |
+#endif
|
|
|
748 |
+
|
|
|
749 |
#ifdef POLKIT_BUILD_TESTS
|
|
|
750 |
|
|
|
751 |
/* this checks that the policy descriptions read from test-valid-3-lang.policy are correct */
|
|
|
752 |
diff -ru PolicyKit-0.7.orig/src/polkit/polkit-sysdeps.c PolicyKit-0.7/src/polkit/polkit-sysdeps.c
|
|
|
753 |
--- PolicyKit-0.7.orig/src/polkit/polkit-sysdeps.c Thu Nov 29 05:26:14 2007
|
|
|
754 |
+++ PolicyKit-0.7/src/polkit/polkit-sysdeps.c Fri Jan 25 15:43:42 2008
|
|
|
755 |
@@ -39,7 +39,20 @@
|
|
|
756 |
#include <grp.h>
|
|
|
757 |
#include <unistd.h>
|
|
|
758 |
#include <errno.h>
|
|
|
759 |
+
|
|
|
760 |
+#ifdef HAVE_SOLARIS
|
|
|
761 |
+#include <fcntl.h>
|
|
|
762 |
+#include <sys/time.h>
|
|
|
763 |
+#if _FILE_OFFSET_BITS==64
|
|
|
764 |
+#undef _FILE_OFFSET_BITS
|
|
|
765 |
+#include <procfs.h>
|
|
|
766 |
+#define _FILE_OFFSET_BITS 64
|
|
|
767 |
+#else
|
|
|
768 |
+#include <procfs.h>
|
|
|
769 |
+#endif
|
|
|
770 |
+#else
|
|
|
771 |
#include <sys/inotify.h>
|
|
|
772 |
+#endif
|
|
|
773 |
#include <syslog.h>
|
|
|
774 |
|
|
|
775 |
#include "polkit-sysdeps.h"
|
|
|
776 |
@@ -74,14 +87,24 @@
|
|
|
777 |
char *contents;
|
|
|
778 |
size_t length;
|
|
|
779 |
polkit_uint64_t start_time;
|
|
|
780 |
+#ifdef HAVE_SOLARIS
|
|
|
781 |
+ struct psinfo info;
|
|
|
782 |
+#else
|
|
|
783 |
char **tokens;
|
|
|
784 |
size_t num_tokens;
|
|
|
785 |
char *p;
|
|
|
786 |
char *endp;
|
|
|
787 |
+#endif
|
|
|
788 |
|
|
|
789 |
start_time = 0;
|
|
|
790 |
contents = NULL;
|
|
|
791 |
|
|
|
792 |
+#ifdef HAVE_SOLARIS
|
|
|
793 |
+ if (polkit_sysdeps_pid_psinfo ( pid, &info)) {
|
|
|
794 |
+ goto out;
|
|
|
795 |
+ }
|
|
|
796 |
+ start_time = (unsigned long long) (info.pr_start.tv_sec);
|
|
|
797 |
+#else
|
|
|
798 |
filename = kit_strdup_printf ("/proc/%d/stat", pid);
|
|
|
799 |
if (filename == NULL) {
|
|
|
800 |
errno = ENOMEM;
|
|
|
801 |
@@ -118,10 +141,13 @@
|
|
|
802 |
}
|
|
|
803 |
|
|
|
804 |
kit_strfreev (tokens);
|
|
|
805 |
+#endif
|
|
|
806 |
|
|
|
807 |
out:
|
|
|
808 |
+#ifndef HAVE_SOLARIS
|
|
|
809 |
kit_free (filename);
|
|
|
810 |
kit_free (contents);
|
|
|
811 |
+#endif
|
|
|
812 |
return start_time;
|
|
|
813 |
}
|
|
|
814 |
|
|
|
815 |
@@ -153,6 +179,15 @@
|
|
|
816 |
|
|
|
817 |
ret = 0;
|
|
|
818 |
|
|
|
819 |
+#ifdef HAVE_SOLARIS
|
|
|
820 |
+ struct psinfo info;
|
|
|
821 |
+
|
|
|
822 |
+ if (polkit_sysdeps_pid_psinfo (pid, &info)) {
|
|
|
823 |
+ goto out;
|
|
|
824 |
+ }
|
|
|
825 |
+ ret = strlen (info.pr_psargs);
|
|
|
826 |
+ strncpy (out_buf, info.pr_psargs, ret);
|
|
|
827 |
+#else
|
|
|
828 |
snprintf (proc_name, sizeof (proc_name), "/proc/%d/exe", pid);
|
|
|
829 |
ret = readlink (proc_name, out_buf, buf_size - 1);
|
|
|
830 |
if (ret == -1) {
|
|
|
831 |
@@ -159,6 +194,7 @@
|
|
|
832 |
strncpy (out_buf, "(unknown)", buf_size);
|
|
|
833 |
goto out;
|
|
|
834 |
}
|
|
|
835 |
+#endif
|
|
|
836 |
kit_assert (ret >= 0 && ret < (int) buf_size - 1);
|
|
|
837 |
out_buf[ret] = '\0';
|
|
|
838 |
|
|
|
839 |
@@ -166,6 +202,26 @@
|
|
|
840 |
return ret;
|
|
|
841 |
}
|
|
|
842 |
|
|
|
843 |
+#ifdef HAVE_SOLARIS
|
|
|
844 |
+int
|
|
|
845 |
+polkit_sysdeps_pid_psinfo (pid_t pid, struct psinfo *ps)
|
|
|
846 |
+{
|
|
|
847 |
+ char pname[32];
|
|
|
848 |
+ int procfd;
|
|
|
849 |
+
|
|
|
850 |
+ (void) snprintf(pname, sizeof(pname), "/proc/%d/psinfo", pid);
|
|
|
851 |
+ if ((procfd = open(pname, O_RDONLY)) == -1) {
|
|
|
852 |
+ return -1;
|
|
|
853 |
+ }
|
|
|
854 |
+ if (read(procfd, ps, sizeof(struct psinfo)) < 0) {
|
|
|
855 |
+ (void) close(procfd);
|
|
|
856 |
+ return -1;
|
|
|
857 |
+ }
|
|
|
858 |
+ (void) close(procfd);
|
|
|
859 |
+ return 0;
|
|
|
860 |
+}
|
|
|
861 |
+#endif
|
|
|
862 |
+
|
|
|
863 |
#ifdef POLKIT_BUILD_TESTS
|
|
|
864 |
|
|
|
865 |
static polkit_bool_t
|
|
|
866 |
diff -ru PolicyKit-0.7.orig/src/polkit-dbus/polkit-read-auth-helper.c PolicyKit-0.7/src/polkit-dbus/polkit-read-auth-helper.c
|
|
|
867 |
--- PolicyKit-0.7.orig/src/polkit-dbus/polkit-read-auth-helper.c Thu Nov 29 12:33:10 2007
|
|
|
868 |
+++ PolicyKit-0.7/src/polkit-dbus/polkit-read-auth-helper.c Fri Jan 25 16:31:42 2008
|
|
|
869 |
@@ -49,6 +49,10 @@
|
|
|
870 |
#include <utime.h>
|
|
|
871 |
#include <fcntl.h>
|
|
|
872 |
#include <dirent.h>
|
|
|
873 |
+#ifdef HAVE_SOLARIS
|
|
|
874 |
+#include <limits.h>
|
|
|
875 |
+#define LOG_AUTHPRIV (10<<3)
|
|
|
876 |
+#endif
|
|
|
877 |
|
|
|
878 |
#include <polkit-dbus/polkit-dbus.h>
|
|
|
879 |
#include <polkit/polkit-private.h>
|
|
|
880 |
@@ -183,8 +187,10 @@
|
|
|
881 |
static const char suffix[] = ".auths";
|
|
|
882 |
struct passwd *pw;
|
|
|
883 |
|
|
|
884 |
+#ifndef HAVE_SOLARIS
|
|
|
885 |
if (d->d_type != DT_REG)
|
|
|
886 |
continue;
|
|
|
887 |
+#endif
|
|
|
888 |
|
|
|
889 |
if (d->d_name == NULL)
|
|
|
890 |
continue;
|
|
|
891 |
@@ -282,8 +288,15 @@
|
|
|
892 |
|
|
|
893 |
#ifndef POLKIT_BUILD_TESTS
|
|
|
894 |
/* clear the entire environment to avoid attacks using with libraries honoring environment variables */
|
|
|
895 |
+#ifdef HAVE_SOLARIS
|
|
|
896 |
+ extern char **environ;
|
|
|
897 |
+
|
|
|
898 |
+ if (environ != NULL)
|
|
|
899 |
+ environ[0] = NULL;
|
|
|
900 |
+#else
|
|
|
901 |
if (clearenv () != 0)
|
|
|
902 |
goto out;
|
|
|
903 |
+#endif
|
|
|
904 |
/* set a minimal environment */
|
|
|
905 |
setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
|
|
|
906 |
#endif
|
|
|
907 |
diff -ru PolicyKit-0.7.orig/src/polkit-dbus/polkit-set-default-helper.c PolicyKit-0.7/src/polkit-dbus/polkit-set-default-helper.c
|
|
|
908 |
--- PolicyKit-0.7.orig/src/polkit-dbus/polkit-set-default-helper.c Thu Nov 29 05:30:30 2007
|
|
|
909 |
+++ PolicyKit-0.7/src/polkit-dbus/polkit-set-default-helper.c Fri Jan 25 16:34:17 2008
|
|
|
910 |
@@ -55,6 +55,10 @@
|
|
|
911 |
#include <polkit/polkit-private.h>
|
|
|
912 |
#include <polkit-dbus/polkit-dbus.h>
|
|
|
913 |
|
|
|
914 |
+#ifdef HAVE_SOLARIS
|
|
|
915 |
+#define LOG_AUTHPRIV (10<<3)
|
|
|
916 |
+#endif
|
|
|
917 |
+
|
|
|
918 |
static polkit_bool_t
|
|
|
919 |
set_default (const char *action_id, const char *any, const char *inactive, const char *active)
|
|
|
920 |
{
|
|
|
921 |
@@ -127,8 +131,15 @@
|
|
|
922 |
|
|
|
923 |
ret = 1;
|
|
|
924 |
/* clear the entire environment to avoid attacks using with libraries honoring environment variables */
|
|
|
925 |
+#ifdef HAVE_SOLARIS
|
|
|
926 |
+ extern char **environ;
|
|
|
927 |
+
|
|
|
928 |
+ if (environ != NULL)
|
|
|
929 |
+ environ[0] = NULL;
|
|
|
930 |
+#else
|
|
|
931 |
if (clearenv () != 0)
|
|
|
932 |
goto out;
|
|
|
933 |
+#endif
|
|
|
934 |
/* set a minimal environment */
|
|
|
935 |
setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
|
|
|
936 |
|
|
|
937 |
diff -ru PolicyKit-0.7.orig/src/polkit-grant/polkit-explicit-grant-helper.c PolicyKit-0.7/src/polkit-grant/polkit-explicit-grant-helper.c
|
|
|
938 |
--- PolicyKit-0.7.orig/src/polkit-grant/polkit-explicit-grant-helper.c Thu Dec 6 09:34:02 2007
|
|
|
939 |
+++ PolicyKit-0.7/src/polkit-grant/polkit-explicit-grant-helper.c Fri Jan 25 17:12:10 2008
|
|
|
940 |
@@ -53,6 +53,10 @@
|
|
|
941 |
#include <polkit-dbus/polkit-dbus.h>
|
|
|
942 |
#include <polkit/polkit-private.h>
|
|
|
943 |
|
|
|
944 |
+#ifdef HAVE_SOLARIS
|
|
|
945 |
+#define LOG_AUTHPRIV (10<<3)
|
|
|
946 |
+#endif
|
|
|
947 |
+
|
|
|
948 |
int
|
|
|
949 |
main (int argc, char *argv[])
|
|
|
950 |
{
|
|
|
951 |
@@ -67,8 +71,15 @@
|
|
|
952 |
ret = 1;
|
|
|
953 |
|
|
|
954 |
/* clear the entire environment to avoid attacks using with libraries honoring environment variables */
|
|
|
955 |
+#ifdef HAVE_SOLARIS
|
|
|
956 |
+ extern char **environ;
|
|
|
957 |
+
|
|
|
958 |
+ if (environ != NULL)
|
|
|
959 |
+ environ[0] = NULL;
|
|
|
960 |
+#else
|
|
|
961 |
if (clearenv () != 0)
|
|
|
962 |
goto out;
|
|
|
963 |
+#endif
|
|
|
964 |
/* set a minimal environment */
|
|
|
965 |
setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
|
|
|
966 |
|
|
|
967 |
diff -ru PolicyKit-0.7.orig/src/polkit-grant/polkit-grant-helper-pam.c PolicyKit-0.7/src/polkit-grant/polkit-grant-helper-pam.c
|
|
|
968 |
--- PolicyKit-0.7.orig/src/polkit-grant/polkit-grant-helper-pam.c Thu Nov 29 05:28:31 2007
|
|
|
969 |
+++ PolicyKit-0.7/src/polkit-grant/polkit-grant-helper-pam.c Fri Jan 25 17:10:54 2008
|
|
|
970 |
@@ -28,6 +28,9 @@
|
|
|
971 |
**************************************************************************/
|
|
|
972 |
|
|
|
973 |
/* TODO: FIXME: XXX: this code needs security review before it can be released! */
|
|
|
974 |
+#ifdef HAVE_CONFIG_H
|
|
|
975 |
+# include <config.h>
|
|
|
976 |
+#endif
|
|
|
977 |
|
|
|
978 |
#include <stdio.h>
|
|
|
979 |
#include <stdlib.h>
|
|
|
980 |
@@ -38,6 +41,10 @@
|
|
|
981 |
#include <syslog.h>
|
|
|
982 |
#include <security/pam_appl.h>
|
|
|
983 |
|
|
|
984 |
+#ifdef HAVE_SOLARIS
|
|
|
985 |
+#define LOG_AUTHPRIV (10<<3)
|
|
|
986 |
+#endif
|
|
|
987 |
+
|
|
|
988 |
/* Development aid: define PGH_DEBUG to get debugging output. Do _NOT_
|
|
|
989 |
* enable this in production builds; it may leak passwords and other
|
|
|
990 |
* sensitive information.
|
|
|
991 |
@@ -60,8 +67,15 @@
|
|
|
992 |
pam_h = NULL;
|
|
|
993 |
|
|
|
994 |
/* clear the entire environment to avoid attacks using with libraries honoring environment variables */
|
|
|
995 |
+#ifdef HAVE_SOLARIS
|
|
|
996 |
+ extern char **environ;
|
|
|
997 |
+
|
|
|
998 |
+ if (environ != NULL)
|
|
|
999 |
+ environ[0] = NULL;
|
|
|
1000 |
+#else
|
|
|
1001 |
if (clearenv () != 0)
|
|
|
1002 |
goto error;
|
|
|
1003 |
+#endif
|
|
|
1004 |
/* set a minimal environment */
|
|
|
1005 |
setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
|
|
|
1006 |
|
|
|
1007 |
diff -ru PolicyKit-0.7.orig/src/polkit-grant/polkit-grant-helper.c PolicyKit-0.7/src/polkit-grant/polkit-grant-helper.c
|
|
|
1008 |
--- PolicyKit-0.7.orig/src/polkit-grant/polkit-grant-helper.c Thu Dec 6 10:48:36 2007
|
|
|
1009 |
+++ PolicyKit-0.7/src/polkit-grant/polkit-grant-helper.c Fri Jan 25 16:35:50 2008
|
|
|
1010 |
@@ -52,6 +52,10 @@
|
|
|
1011 |
#include <polkit-dbus/polkit-dbus.h>
|
|
|
1012 |
// #include <polkit/polkit-grant-database.h>
|
|
|
1013 |
|
|
|
1014 |
+#ifdef HAVE_SOLARIS
|
|
|
1015 |
+#define LOG_AUTHPRIV (10<<3)
|
|
|
1016 |
+#endif
|
|
|
1017 |
+
|
|
|
1018 |
/* Development aid: define PGH_DEBUG to get debugging output. Do _NOT_
|
|
|
1019 |
* enable this in production builds; it may leak passwords and other
|
|
|
1020 |
* sensitive information.
|
|
|
1021 |
@@ -546,8 +550,15 @@
|
|
|
1022 |
ret = 3;
|
|
|
1023 |
|
|
|
1024 |
/* clear the entire environment to avoid attacks using with libraries honoring environment variables */
|
|
|
1025 |
+#ifdef HAVE_SOLARIS
|
|
|
1026 |
+ extern char **environ;
|
|
|
1027 |
+
|
|
|
1028 |
+ if (environ != NULL)
|
|
|
1029 |
+ environ[0] = NULL;
|
|
|
1030 |
+#else
|
|
|
1031 |
if (clearenv () != 0)
|
|
|
1032 |
goto out;
|
|
|
1033 |
+#endif
|
|
|
1034 |
/* set a minimal environment */
|
|
|
1035 |
setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
|
|
|
1036 |
|
|
|
1037 |
diff -ru PolicyKit-0.7.orig/src/polkit-grant/polkit-grant.c PolicyKit-0.7/src/polkit-grant/polkit-grant.c
|
|
|
1038 |
--- PolicyKit-0.7.orig/src/polkit-grant/polkit-grant.c Thu Nov 29 05:29:25 2007
|
|
|
1039 |
+++ PolicyKit-0.7/src/polkit-grant/polkit-grant.c Fri Jan 25 16:40:18 2008
|
|
|
1040 |
@@ -35,6 +35,7 @@
|
|
|
1041 |
#include <stdio.h>
|
|
|
1042 |
#include <stdlib.h>
|
|
|
1043 |
#include <string.h>
|
|
|
1044 |
+#include <errno.h>
|
|
|
1045 |
#include <sys/types.h>
|
|
|
1046 |
#include <unistd.h>
|
|
|
1047 |
#include <sys/wait.h>
|
|
|
1048 |
@@ -542,6 +543,49 @@
|
|
|
1049 |
return FALSE;
|
|
|
1050 |
}
|
|
|
1051 |
|
|
|
1052 |
+#ifdef HAVE_SOLARIS
|
|
|
1053 |
+#define BUFFER_LEN 256
|
|
|
1054 |
+
|
|
|
1055 |
+ssize_t getline (char **lineptr, size_t *n, FILE *f)
|
|
|
1056 |
+{
|
|
|
1057 |
+ char ch;
|
|
|
1058 |
+ size_t m = 0;
|
|
|
1059 |
+ ssize_t buf_len = 0;
|
|
|
1060 |
+ char * buf = NULL;
|
|
|
1061 |
+ char * p = NULL;
|
|
|
1062 |
+
|
|
|
1063 |
+
|
|
|
1064 |
+ while ( (ch = getc(f)) !=EOF )
|
|
|
1065 |
+ {
|
|
|
1066 |
+ if (errno != 0)
|
|
|
1067 |
+ return -1;
|
|
|
1068 |
+ if ( m++ >= buf_len )
|
|
|
1069 |
+ {
|
|
|
1070 |
+ buf_len += BUFFER_LEN;
|
|
|
1071 |
+ buf = (char *) realloc(buf, buf_len + 1);
|
|
|
1072 |
+ if ( buf == NULL )
|
|
|
1073 |
+ {
|
|
|
1074 |
+ return -1;
|
|
|
1075 |
+ }
|
|
|
1076 |
+ p = buf + buf_len - BUFFER_LEN;
|
|
|
1077 |
+ }
|
|
|
1078 |
+ if ( ch == '\n' )
|
|
|
1079 |
+ break;
|
|
|
1080 |
+ *p = ch;
|
|
|
1081 |
+ p++;
|
|
|
1082 |
+ }
|
|
|
1083 |
+ if ( m == 0 )
|
|
|
1084 |
+ {
|
|
|
1085 |
+ return -1;
|
|
|
1086 |
+ } else {
|
|
|
1087 |
+ *p = '\0';
|
|
|
1088 |
+ *lineptr = buf;
|
|
|
1089 |
+ *n = m;
|
|
|
1090 |
+ return m;
|
|
|
1091 |
+ }
|
|
|
1092 |
+}
|
|
|
1093 |
+#endif
|
|
|
1094 |
+
|
|
|
1095 |
#ifdef POLKIT_BUILD_TESTS
|
|
|
1096 |
|
|
|
1097 |
static polkit_bool_t
|
|
|
1098 |
diff -ru PolicyKit-0.7.orig/src/polkit-grant/polkit-revoke-helper.c PolicyKit-0.7/src/polkit-grant/polkit-revoke-helper.c
|
|
|
1099 |
--- PolicyKit-0.7.orig/src/polkit-grant/polkit-revoke-helper.c Thu Nov 29 13:28:35 2007
|
|
|
1100 |
+++ PolicyKit-0.7/src/polkit-grant/polkit-revoke-helper.c Fri Jan 25 17:12:46 2008
|
|
|
1101 |
@@ -52,6 +52,10 @@
|
|
|
1102 |
#include <polkit-dbus/polkit-dbus.h>
|
|
|
1103 |
#include <polkit/polkit-private.h>
|
|
|
1104 |
|
|
|
1105 |
+#ifdef HAVE_SOLARIS
|
|
|
1106 |
+#define LOG_AUTHPRIV (10<<3)
|
|
|
1107 |
+#endif
|
|
|
1108 |
+
|
|
|
1109 |
static int
|
|
|
1110 |
_write_to_fd (int fd, const char *str, ssize_t str_len)
|
|
|
1111 |
{
|
|
|
1112 |
@@ -109,8 +113,15 @@
|
|
|
1113 |
|
|
|
1114 |
#ifndef POLKIT_BUILD_TESTS
|
|
|
1115 |
/* clear the entire environment to avoid attacks using with libraries honoring environment variables */
|
|
|
1116 |
+#ifdef HAVE_SOLARIS
|
|
|
1117 |
+ extern char **environ;
|
|
|
1118 |
+
|
|
|
1119 |
+ if (environ != NULL)
|
|
|
1120 |
+ environ[0] = NULL;
|
|
|
1121 |
+#else
|
|
|
1122 |
if (clearenv () != 0)
|
|
|
1123 |
goto out;
|
|
|
1124 |
+#endif
|
|
|
1125 |
/* set a minimal environment */
|
|
|
1126 |
setenv ("PATH", "/usr/sbin:/usr/bin:/sbin:/bin", 1);
|
|
|
1127 |
#endif
|
|
|
1128 |
diff -ru PolicyKit-0.7.orig/tools/polkit-auth.c PolicyKit-0.7/tools/polkit-auth.c
|
|
|
1129 |
--- PolicyKit-0.7.orig/tools/polkit-auth.c Thu Dec 6 11:30:18 2007
|
|
|
1130 |
+++ PolicyKit-0.7/tools/polkit-auth.c Fri Jan 25 17:19:42 2008
|
|
|
1131 |
@@ -37,6 +37,9 @@
|
|
|
1132 |
#include <stdlib.h>
|
|
|
1133 |
#include <string.h>
|
|
|
1134 |
#include <sys/types.h>
|
|
|
1135 |
+#ifdef HAVE_SOLARIS
|
|
|
1136 |
+#include <sys/wait.h>
|
|
|
1137 |
+#endif
|
|
|
1138 |
#include <pwd.h>
|
|
|
1139 |
#include <grp.h>
|
|
|
1140 |
#include <unistd.h>
|
|
|
1141 |
Only in PolicyKit-0.7/tools: polkit-auth.o
|
|
|
1142 |
Only in PolicyKit-0.7/tools: polkit-config-file-validate
|
|
|
1143 |
Only in PolicyKit-0.7/tools: polkit-config-file-validate.o
|
|
|
1144 |
Only in PolicyKit-0.7/tools: polkit-policy-file-validate
|
|
|
1145 |
Only in PolicyKit-0.7/tools: polkit-policy-file-validate.o
|