diff -Naurp --exclude-from excludes old/policycoreutils/semanage/seobject.py new/policycoreutils/semanage/seobject.py --- old/policycoreutils/semanage/seobject.py 2006-03-08 12:16:06.000000000 -0500 +++ new/policycoreutils/semanage/seobject.py 2006-03-16 16:56:37.000000000 -0500 @@ -549,7 +549,7 @@ class seluserRecords(semanageRecords): raise ValueError("Could not list roles for user %s" % name) roles = string.join(rlist, ' '); - ddict[semanage_user_get_name(u)] = (semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) + ddict[semanage_user_get_name(u)] = (semanage_user_get_prefix(u), semanage_user_get_mlslevel(u), semanage_user_get_mlsrange(u), roles) return ddict @@ -559,10 +559,10 @@ class seluserRecords(semanageRecords): keys.sort() if is_mls_enabled == 1: if heading: - print "\n%-15s %-10s %-30s" % ("", "MLS/", "MLS/") - print "%-15s %-10s %-30s %s\n" % ("SELinux User", "MCS Level", "MCS Range", "SELinux Roles") + print "\n%-15s %-10s %-10s %-30s" % ("", "Labeling", "MLS/", "MLS/") + print "%-15s %-10s %-10s %-30s %s\n" % ("SELinux User", "Prefix", "MCS Level", "MCS Range", "SELinux Roles") for k in keys: - print "%-15s %-10s %-30s %s" % (k, translate(ddict[k][0]), translate(ddict[k][1]), ddict[k][2]) + print "%-15s %-10s %-10s %-30s %s" % (k, ddict[k][0], translate(ddict[k][1]), translate(ddict[k][2]), ddict[k][3]) else: if heading: print "%-15s %s\n" % ("SELinux User", "SELinux Roles")