|
 |
54939fa |
diff --exclude-from=exclude -N -u -r nsalibselinux/include/selinux/selinux.h libselinux-1.27.14/include/selinux/selinux.h
|
|
|
54939fa |
--- nsalibselinux/include/selinux/selinux.h 2005-10-25 15:15:53.000000000 -0400
|
|
|
54939fa |
+++ libselinux-1.27.14/include/selinux/selinux.h 2005-10-25 17:54:34.000000000 -0400
|
|
|
54939fa |
@@ -359,6 +359,7 @@
|
|
|
54939fa |
extern const char *selinux_customizable_types_path(void);
|
|
|
54939fa |
extern const char *selinux_users_path(void);
|
|
|
54939fa |
extern const char *selinux_usersconf_path(void);
|
|
|
54939fa |
+extern const char *selinux_translations_path(void);
|
|
|
54939fa |
extern const char *selinux_path(void);
|
|
|
54939fa |
|
|
|
54939fa |
/* Check a permission in the passwd class.
|
|
|
54939fa |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libselinux-1.27.14/src/file_path_suffixes.h
|
|
|
54939fa |
--- nsalibselinux/src/file_path_suffixes.h 2005-10-25 15:15:53.000000000 -0400
|
|
|
54939fa |
+++ libselinux-1.27.14/src/file_path_suffixes.h 2005-10-25 17:53:04.000000000 -0400
|
|
|
54939fa |
@@ -13,3 +13,4 @@
|
|
|
54939fa |
S_(CUSTOMIZABLE_TYPES, "/contexts/customizable_types")
|
|
|
54939fa |
S_(USERS_DIR, "/users/")
|
|
|
54939fa |
S_(SEUSERS, "/seusers")
|
|
|
54939fa |
+S_(TRANSLATIONS, "/setrans.conf")
|
|
|
54939fa |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.27.14/src/selinux_config.c
|
|
|
54939fa |
--- nsalibselinux/src/selinux_config.c 2005-10-25 15:15:53.000000000 -0400
|
|
|
9f412a6 |
+++ libselinux-1.27.14/src/selinux_config.c 2005-10-26 15:58:29.000000000 -0400
|
|
|
54939fa |
@@ -32,7 +32,8 @@
|
|
|
54939fa |
#define CUSTOMIZABLE_TYPES 11
|
|
|
54939fa |
#define USERS_DIR 12
|
|
|
54939fa |
#define SEUSERS 13
|
|
|
54939fa |
-#define NEL 14
|
|
|
54939fa |
+#define TRANSLATIONS 14
|
|
|
54939fa |
+#define NEL 15
|
|
|
54939fa |
|
|
|
54939fa |
/* New layout is relative to SELINUXDIR/policytype. */
|
|
|
54939fa |
static char *file_paths[NEL];
|
|
|
9f412a6 |
@@ -192,7 +193,9 @@
|
|
|
9f412a6 |
}
|
|
|
9f412a6 |
free(line_buf);
|
|
|
9f412a6 |
fclose(fp);
|
|
|
9f412a6 |
- }
|
|
|
9f412a6 |
+ }
|
|
|
9f412a6 |
+ else
|
|
|
9f412a6 |
+ return;
|
|
|
9f412a6 |
|
|
|
9f412a6 |
for (i = 0; i < NEL; i++) {
|
|
|
9f412a6 |
len = rootlen + strlen(file_path_suffixes_data.str
|
|
|
9f412a6 |
@@ -303,10 +306,16 @@
|
|
|
54939fa |
const char *selinux_users_path() {
|
|
|
54939fa |
return get_path(USERS_DIR);
|
|
|
54939fa |
}
|
|
|
54939fa |
+hidden_def(selinux_users_path)
|
|
|
54939fa |
+
|
|
|
54939fa |
const char *selinux_usersconf_path() {
|
|
|
54939fa |
return get_path(SEUSERS);
|
|
|
54939fa |
}
|
|
|
54939fa |
-
|
|
|
54939fa |
-hidden_def(selinux_users_path)
|
|
|
54939fa |
hidden_def(selinux_usersconf_path)
|
|
|
54939fa |
|
|
|
54939fa |
+const char *selinux_translations_path()
|
|
|
54939fa |
+{
|
|
|
54939fa |
+ return get_path(TRANSLATIONS);
|
|
|
54939fa |
+}
|
|
|
54939fa |
+hidden_def(selinux_translations_path)
|
|
|
54939fa |
+
|
|
|
54939fa |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libselinux-1.27.14/src/selinux_internal.h
|
|
|
54939fa |
--- nsalibselinux/src/selinux_internal.h 2005-10-25 15:15:53.000000000 -0400
|
|
|
54939fa |
+++ libselinux-1.27.14/src/selinux_internal.h 2005-10-25 18:01:47.000000000 -0400
|
|
|
54939fa |
@@ -60,6 +60,7 @@
|
|
|
54939fa |
hidden_proto(matchpathcon_init)
|
|
|
54939fa |
hidden_proto(selinux_users_path)
|
|
|
54939fa |
hidden_proto(selinux_usersconf_path);
|
|
|
54939fa |
+hidden_proto(selinux_translations_path);
|
|
|
54939fa |
hidden_proto(selinux_getenforcemode);
|
|
|
54939fa |
|
|
|
54939fa |
extern int context_translations hidden;
|
|
|
9f412a6 |
diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-1.27.14/src/seusers.c
|
|
|
9f412a6 |
--- nsalibselinux/src/seusers.c 2005-10-17 13:42:38.000000000 -0400
|
|
|
9f412a6 |
+++ libselinux-1.27.14/src/seusers.c 2005-10-26 16:13:53.000000000 -0400
|
|
|
9f412a6 |
@@ -115,7 +115,7 @@
|
|
|
9f412a6 |
if (!strcmp(username, name))
|
|
|
9f412a6 |
break;
|
|
|
9f412a6 |
|
|
|
9f412a6 |
- if (!defaultseuser && !strcmp(username,"default")) {
|
|
|
9f412a6 |
+ if (!defaultseuser && !strcmp(username,"__default__")) {
|
|
|
9f412a6 |
free(username);
|
|
|
9f412a6 |
defaultseuser = seuser;
|
|
|
9f412a6 |
defaultlevel = level;
|