diff --git a/sepolgen/src/sepolgen/access.py b/sepolgen/src/sepolgen/access.py index 1f89ecde..a5d86982 100644 --- a/sepolgen/src/sepolgen/access.py +++ b/sepolgen/src/sepolgen/access.py @@ -128,7 +128,7 @@ class AccessVector(util.Comparison): is represented in a list. """ l = [self.src_type, self.tgt_type, self.obj_class] - l.extend(self.perms) + l.extend(sorted(self.perms)) return l def __str__(self): diff --git a/sepolgen/src/sepolgen/interfaces.py b/sepolgen/src/sepolgen/interfaces.py index 0b688bfd..48ae4f27 100644 --- a/sepolgen/src/sepolgen/interfaces.py +++ b/sepolgen/src/sepolgen/interfaces.py @@ -341,12 +341,12 @@ class InterfaceSet: self.output.write(str + "\n") def to_file(self, fd): - for iv in self.interfaces.values(): + for iv in sorted(self.interfaces.values(), key=lambda x: x.name): fd.write("[InterfaceVector %s " % iv.name) - for param in iv.params.values(): + for param in sorted(iv.params.values(), key=lambda x: x.name): fd.write("%s:%s " % (param.name, refpolicy.field_to_str[param.type])) fd.write("]\n") - avl = iv.access.to_list() + avl = sorted(iv.access.to_list()) for av in avl: fd.write(",".join(av)) fd.write("\n") diff --git a/sepolgen/src/sepolgen/refpolicy.py b/sepolgen/src/sepolgen/refpolicy.py index 737f9562..31b40d8f 100644 --- a/sepolgen/src/sepolgen/refpolicy.py +++ b/sepolgen/src/sepolgen/refpolicy.py @@ -251,10 +251,10 @@ class IdSet(set): self.compliment = False def to_space_str(self): - return list_to_space_str(self) + return list_to_space_str(sorted(self)) def to_comma_str(self): - return list_to_comma_str(self) + return list_to_comma_str(sorted(self)) class SecurityContext(Leaf): """An SELinux security context with optional MCS / MLS fields."""