- Change default to __default__
This commit is contained in:
parent
54939fac9a
commit
9f412a6358
@ -19,7 +19,7 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/file_path_suffixes.h libs
|
|||||||
+S_(TRANSLATIONS, "/setrans.conf")
|
+S_(TRANSLATIONS, "/setrans.conf")
|
||||||
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.27.14/src/selinux_config.c
|
diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselinux-1.27.14/src/selinux_config.c
|
||||||
--- nsalibselinux/src/selinux_config.c 2005-10-25 15:15:53.000000000 -0400
|
--- nsalibselinux/src/selinux_config.c 2005-10-25 15:15:53.000000000 -0400
|
||||||
+++ libselinux-1.27.14/src/selinux_config.c 2005-10-25 17:53:41.000000000 -0400
|
+++ libselinux-1.27.14/src/selinux_config.c 2005-10-26 15:58:29.000000000 -0400
|
||||||
@@ -32,7 +32,8 @@
|
@@ -32,7 +32,8 @@
|
||||||
#define CUSTOMIZABLE_TYPES 11
|
#define CUSTOMIZABLE_TYPES 11
|
||||||
#define USERS_DIR 12
|
#define USERS_DIR 12
|
||||||
@ -30,7 +30,18 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_config.c libselin
|
|||||||
|
|
||||||
/* New layout is relative to SELINUXDIR/policytype. */
|
/* New layout is relative to SELINUXDIR/policytype. */
|
||||||
static char *file_paths[NEL];
|
static char *file_paths[NEL];
|
||||||
@@ -303,10 +304,16 @@
|
@@ -192,7 +193,9 @@
|
||||||
|
}
|
||||||
|
free(line_buf);
|
||||||
|
fclose(fp);
|
||||||
|
- }
|
||||||
|
+ }
|
||||||
|
+ else
|
||||||
|
+ return;
|
||||||
|
|
||||||
|
for (i = 0; i < NEL; i++) {
|
||||||
|
len = rootlen + strlen(file_path_suffixes_data.str
|
||||||
|
@@ -303,10 +306,16 @@
|
||||||
const char *selinux_users_path() {
|
const char *selinux_users_path() {
|
||||||
return get_path(USERS_DIR);
|
return get_path(USERS_DIR);
|
||||||
}
|
}
|
||||||
@ -60,3 +71,15 @@ diff --exclude-from=exclude -N -u -r nsalibselinux/src/selinux_internal.h libsel
|
|||||||
hidden_proto(selinux_getenforcemode);
|
hidden_proto(selinux_getenforcemode);
|
||||||
|
|
||||||
extern int context_translations hidden;
|
extern int context_translations hidden;
|
||||||
|
diff --exclude-from=exclude -N -u -r nsalibselinux/src/seusers.c libselinux-1.27.14/src/seusers.c
|
||||||
|
--- nsalibselinux/src/seusers.c 2005-10-17 13:42:38.000000000 -0400
|
||||||
|
+++ libselinux-1.27.14/src/seusers.c 2005-10-26 16:13:53.000000000 -0400
|
||||||
|
@@ -115,7 +115,7 @@
|
||||||
|
if (!strcmp(username, name))
|
||||||
|
break;
|
||||||
|
|
||||||
|
- if (!defaultseuser && !strcmp(username,"default")) {
|
||||||
|
+ if (!defaultseuser && !strcmp(username,"__default__")) {
|
||||||
|
free(username);
|
||||||
|
defaultseuser = seuser;
|
||||||
|
defaultlevel = level;
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
%define libsepolver 1.9.30-1
|
%define libsepolver 1.9.32-1
|
||||||
Summary: SELinux library and simple utilities
|
Summary: SELinux library and simple utilities
|
||||||
Name: libselinux
|
Name: libselinux
|
||||||
Version: 1.27.14
|
Version: 1.27.14
|
||||||
Release: 2
|
Release: 3
|
||||||
License: Public domain (uncopyrighted)
|
License: Public domain (uncopyrighted)
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
|
Source: http://www.nsa.gov/selinux/archives/%{name}-%{version}.tgz
|
||||||
@ -92,6 +92,9 @@ exit 0
|
|||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Oct 26 2005 Dan Walsh <dwalsh@redhat.com> 1.9.24-3
|
||||||
|
- Change default to __default__
|
||||||
|
|
||||||
* Tue Oct 25 2005 Dan Walsh <dwalsh@redhat.com> 1.9.24-2
|
* Tue Oct 25 2005 Dan Walsh <dwalsh@redhat.com> 1.9.24-2
|
||||||
- Add selinux_translations_path
|
- Add selinux_translations_path
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user