]>
Commit | Line | Data |
---|---|---|
b98fb9c9 JB |
1 | --- pwdutils-3.2.19.orig/lib/public.h 2005-06-22 11:05:53.000000000 +0200 |
2 | +++ pwdutils-3.2.19/lib/public.h 2012-05-26 07:35:09.397451177 +0200 | |
3 | @@ -115,7 +115,7 @@ | |
4 | ||
5 | ||
6 | #ifdef WITH_SELINUX | |
7 | -extern int selinux_check_access (const char *__chuser, | |
8 | +extern int pwdu_selinux_check_access (const char *__chuser, | |
9 | unsigned int __selaccess) __attribute_warn_unused_result__; | |
10 | extern int set_default_context (const char *filename, | |
11 | char **prev_context) __attribute_warn_unused_result__; | |
12 | --- pwdutils-3.2.19.orig/lib/selinux_utils.c 2006-11-29 14:19:06.000000000 +0100 | |
13 | +++ pwdutils-3.2.19/lib/selinux_utils.c 2012-05-26 07:35:09.397451177 +0200 | |
14 | @@ -33,7 +33,7 @@ | |
15 | #include "public.h" | |
16 | ||
17 | int | |
18 | -selinux_check_access (const char *chuser, unsigned int selaccess) | |
19 | +pwdu_selinux_check_access (const char *chuser, unsigned int selaccess) | |
20 | { | |
21 | int status = -1; | |
22 | security_context_t user_context; | |
23 | --- pwdutils-3.2.19.orig/src/chfn.c 2006-11-29 14:19:39.000000000 +0100 | |
24 | +++ pwdutils-3.2.19/src/chfn.c 2012-05-26 07:35:09.394117844 +0200 | |
25 | @@ -578,7 +578,7 @@ | |
26 | if (is_selinux_enabled () > 0) | |
27 | { | |
28 | if ((uid == 0) && | |
29 | - (selinux_check_access (pw_data->pw.pw_name, PASSWD__CHFN) != 0)) | |
30 | + (pwdu_selinux_check_access (pw_data->pw.pw_name, PASSWD__CHFN) != 0)) | |
31 | { | |
32 | security_context_t user_context; | |
33 | if (getprevcon (&user_context) < 0) | |
34 | --- pwdutils-3.2.19.orig/src/chsh.c 2006-11-29 14:19:43.000000000 +0100 | |
35 | +++ pwdutils-3.2.19/src/chsh.c 2012-05-26 07:35:09.397451177 +0200 | |
36 | @@ -443,7 +443,7 @@ | |
37 | if (is_selinux_enabled () > 0) | |
38 | { | |
39 | if ((uid == 0) && | |
40 | - (selinux_check_access (pw_data->pw.pw_name, PASSWD__CHSH) != 0)) | |
41 | + (pwdu_selinux_check_access (pw_data->pw.pw_name, PASSWD__CHSH) != 0)) | |
42 | { | |
43 | security_context_t user_context; | |
44 | if (getprevcon (&user_context) < 0) | |
45 | --- pwdutils-3.2.19.orig/src/passwd.c 2012-05-08 14:12:35.000000000 +0200 | |
46 | +++ pwdutils-3.2.19/src/passwd.c 2012-05-26 07:35:09.390784511 +0200 | |
47 | @@ -704,7 +704,7 @@ | |
48 | if (is_selinux_enabled () > 0) | |
49 | { | |
50 | if ((uid == 0) && | |
51 | - (selinux_check_access (pw->pw_name, PASSWD__PASSWD) != 0)) | |
52 | + (pwdu_selinux_check_access (pw->pw_name, PASSWD__PASSWD) != 0)) | |
53 | { | |
54 | security_context_t user_context; | |
55 | if (getprevcon (&user_context) < 0) |