diff --exclude-from=exclude -N -u -r nsapolicycoreutils/newrole/newrole.c policycoreutils-1.30.22/newrole/newrole.c
--- nsapolicycoreutils/newrole/newrole.c	2006-07-03 07:52:43.000000000 -0400
+++ policycoreutils-1.30.22/newrole/newrole.c	2006-08-01 09:53:54.000000000 -0400
@@ -47,6 +47,7 @@
  *
  *************************************************************************/
 
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>		/* for malloc(), realloc(), free() */
 #include <pwd.h>		/* for getpwuid() */
@@ -855,7 +856,10 @@
 
 	if (optind < 1)
 		optind = 1;
-	argv[optind - 1] = pw->pw_shell;
+	if (asprintf(&argv[optind - 1], "-%s", pw->pw_shell) < 0) {
+		fprintf(stderr, _("Error allocating shell.\n"));
+	}
+
 #ifdef CANTSPELLGDB
 	{
 		int i;
@@ -897,7 +901,7 @@
 	}
 #endif
 	freecon(old_context);
-	execv(argv[optind - 1], argv + optind - 1);
+	execv(pw->pw_shell, argv + optind - 1);
 
 	/* If we reach here, then we failed to exec the new shell. */
 	perror(_("failed to exec shell\n"));
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/fr.po policycoreutils-1.30.22/po/fr.po
--- nsapolicycoreutils/po/fr.po	2006-08-01 09:47:27.000000000 -0400
+++ policycoreutils-1.30.22/po/fr.po	2006-08-01 09:56:24.000000000 -0400
@@ -8,14 +8,14 @@
 msgstr ""
 "Project-Id-Version: Policy Core Utils 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-07 23:15+0200\n"
+"POT-Creation-Date: 2006-05-26 13:48-0400\n"
 "PO-Revision-Date: 2006-07-08 13:34+0200\n"
 "Last-Translator: Guillaume CHARDIN <guillaume.chardin@gmail.com>\n"
 "Language-Team: French\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: "
+"Plural-Forms: \n"
 
 #: ../load_policy/load_policy.c:22
 #, c-format
@@ -189,12 +189,16 @@
 #: ../newrole/newrole.c:717
 #, c-format
 msgid "%s!  Could not get current context for %s, not relabeling tty.\n"
-msgstr "%s! Ne peut récupérer le contexte actuel pour %s, le tty ne sera pas renomé.\n"
+msgstr ""
+"%s! Ne peut récupérer le contexte actuel pour %s, le tty ne sera pas "
+"renomé.\n"
 
 #: ../newrole/newrole.c:728
 #, c-format
 msgid "%s!  Could not get new context for %s, not relabeling tty.\n"
-msgstr "%s! Ne peut récupérer le nouveau contexte pour %s, le tty ne sera pas renomé.\n"
+msgstr ""
+"%s! Ne peut récupérer le nouveau contexte pour %s, le tty ne sera pas "
+"renomé.\n"
 
 #: ../newrole/newrole.c:740
 #, c-format
@@ -250,7 +254,8 @@
 "USAGE: run_init <script> <args ...>\n"
 "  where: <script> is the name of the init script to run,\n"
 "         <args ...> are the arguments to that script."
-msgstr "SYNTAXE: run_init <script> <arg ...>\n"
+msgstr ""
+"SYNTAXE: run_init <script> <arg ...>\n"
 "  où: <script> est le nom du script d'initialisation à exécuter,\n"
 "         <args ...> sont les arguments à passer au script."
 
@@ -286,7 +291,8 @@
 #: ../scripts/chcat:84 ../scripts/chcat:154
 #, c-format
 msgid "Can not modify sensitivity levels using '+' on %s"
-msgstr "Impossible de modifier le niveau de sensibilité en utilisant '+' sur %s"
+msgstr ""
+"Impossible de modifier le niveau de sensibilité en utilisant '+' sur %s"
 
 #: ../scripts/chcat:88
 #, c-format
@@ -401,7 +407,8 @@
 #: ../semanage/seobject.py:131
 #, python-format
 msgid "Unable to open %s: translations not supported on non-MLS machines"
-msgstr "Impossible d'ouvrir %s: traduction non supportée sur une machine non MLS"
+msgstr ""
+"Impossible d'ouvrir %s: traduction non supportée sur une machine non MLS"
 
 #: ../semanage/seobject.py:171 ../semanage/seobject.py:185
 #, python-format
@@ -519,7 +526,8 @@
 #: ../semanage/seobject.py:355
 #, python-format
 msgid "Login mapping for %s is defined in policy, cannot be deleted"
-msgstr "Le mappage pour %s est défini dans une stratégie, il ne peut être supprimé"
+msgstr ""
+"Le mappage pour %s est défini dans une stratégie, il ne peut être supprimé"
 
 #: ../semanage/seobject.py:364 ../semanage/seobject.py:368
 #, python-format
@@ -597,7 +605,9 @@
 #: ../semanage/seobject.py:561
 #, python-format
 msgid "SELinux user %s is defined in policy, cannot be deleted"
-msgstr "L'utilisateur SELinux %s est défini dans une stratégie, il ne peut être supprimé"
+msgstr ""
+"L'utilisateur SELinux %s est défini dans une stratégie, il ne peut être "
+"supprimé"
 
 #: ../semanage/seobject.py:569 ../semanage/seobject.py:573
 #, python-format
@@ -654,7 +664,8 @@
 #: ../semanage/seobject.py:671
 #, python-format
 msgid "Could not set user in port context for %s/%s"
-msgstr "Impossible de définir l'utilisateur dans le contexte du port pour %s/%s"
+msgstr ""
+"Impossible de définir l'utilisateur dans le contexte du port pour %s/%s"
 
 #: ../semanage/seobject.py:675
 #, python-format
@@ -669,7 +680,8 @@
 #: ../semanage/seobject.py:684
 #, python-format
 msgid "Could not set mls fields in port context for %s/%s"
-msgstr "Impossible de définir les champs mls dans le contexte de port pour %s/%s"
+msgstr ""
+"Impossible de définir les champs mls dans le contexte de port pour %s/%s"
 
 #: ../semanage/seobject.py:688
 #, python-format
@@ -752,7 +764,8 @@
 #: ../semanage/seobject.py:865
 #, python-format
 msgid "Could not set user in interface context for %s"
-msgstr "Impossible de définir l'utilisateur dans le contexte d'interface pour %s"
+msgstr ""
+"Impossible de définir l'utilisateur dans le contexte d'interface pour %s"
 
 #: ../semanage/seobject.py:869
 #, python-format
@@ -767,7 +780,8 @@
 #: ../semanage/seobject.py:878
 #, python-format
 msgid "Could not set mls fields in interface context for %s"
-msgstr "Impossible de définir les champs mls dans le contexte d'interface pour %s"
+msgstr ""
+"Impossible de définir les champs mls dans le contexte d'interface pour %s"
 
 #: ../semanage/seobject.py:882
 #, python-format
@@ -802,7 +816,8 @@
 #: ../semanage/seobject.py:959
 #, python-format
 msgid "Interface %s is defined in policy, cannot be deleted"
-msgstr "L'interface %s est définie dans les stratégies, elle ne peut être supprimée "
+msgstr ""
+"L'interface %s est définie dans les stratégies, elle ne peut être supprimée "
 
 #: ../semanage/seobject.py:967 ../semanage/seobject.py:971
 #, python-format
@@ -832,7 +847,8 @@
 #: ../semanage/seobject.py:1037
 #, python-format
 msgid "Could not set user in file context for %s"
-msgstr "Impossible de définir l'utilisateur dans le contexte de fichier pour %s"
+msgstr ""
+"Impossible de définir l'utilisateur dans le contexte de fichier pour %s"
 
 #: ../semanage/seobject.py:1041
 #, python-format
@@ -847,7 +863,8 @@
 #: ../semanage/seobject.py:1050
 #, python-format
 msgid "Could not set mls fields in file context for %s"
-msgstr "Impossible de définir les champs mls dans le contexte du fichier pour %s"
+msgstr ""
+"Impossible de définir les champs mls dans le contexte du fichier pour %s"
 
 #: ../semanage/seobject.py:1056
 #, python-format
@@ -881,7 +898,9 @@
 #: ../semanage/seobject.py:1131
 #, python-format
 msgid "File context for %s is defined in policy, cannot be deleted"
-msgstr "Le contexte de fichier pour %s est défini dans les stratégie, il ne peu être supprimé"
+msgstr ""
+"Le contexte de fichier pour %s est défini dans les stratégie, il ne peu être "
+"supprimé"
 
 #: ../semanage/seobject.py:1139 ../semanage/seobject.py:1143
 #, python-format
@@ -967,4 +986,3 @@
 #, c-format
 msgid "Options Error: %s "
 msgstr "Options invalides: %s "
-
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/po/sv.po policycoreutils-1.30.22/po/sv.po
--- nsapolicycoreutils/po/sv.po	2006-08-01 09:47:27.000000000 -0400
+++ policycoreutils-1.30.22/po/sv.po	2006-08-01 09:56:24.000000000 -0400
@@ -1,46 +1,64 @@
+# Swedish messages for policycoreutils.
+# Copyright (C) 2006 Christian Rose.
+# Christian Rose <menthos@menthos.com>, 2006.
+#
+# $Id: sv.po,v 1.5 2006/07/21 22:29:14 menthos Exp $
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: policycoreutils\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-26 13:48-0400\n"
+"PO-Revision-Date: 2006-07-22 00:28+0200\n"
+"Last-Translator: Christian Rose <menthos@menthos.com>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
 #: ../load_policy/load_policy.c:22
 #, c-format
 msgid "usage:  %s [-bq]\n"
-msgstr ""
+msgstr "anvÀndning: %s [-bq]\n"
 
 #: ../load_policy/load_policy.c:62
 #, c-format
 msgid "%s:  Can't load policy:  %s\n"
-msgstr ""
+msgstr "%s: Kan inte lÀsa in policy: %s\n"
 
 #: ../newrole/newrole.c:97
 #, c-format
 msgid "Out of memory!\n"
-msgstr ""
+msgstr "Slut pÄ minne!\n"
 
 #: ../newrole/newrole.c:201 ../run_init/run_init.c:126
 #, c-format
 msgid "failed to initialize PAM\n"
-msgstr ""
+msgstr "misslyckades med att initiera PAM\n"
 
 #: ../newrole/newrole.c:212
 #, c-format
 msgid "failed to set PAM_TTY\n"
-msgstr ""
+msgstr "misslyckades med att sÀtta PAM_TTY\n"
 
 #: ../newrole/newrole.c:250 ../run_init/run_init.c:155
 msgid "Password:"
-msgstr "Password:"
+msgstr "Lösenord:"
 
 #: ../newrole/newrole.c:282 ../run_init/run_init.c:187
 #, c-format
 msgid "Cannot find your entry in the shadow passwd file.\n"
-msgstr ""
+msgstr "Kan inte hitta din post i skugglösenordsfilen.\n"
 
 #: ../newrole/newrole.c:288 ../run_init/run_init.c:193
 #, c-format
 msgid "getpass cannot open /dev/tty\n"
-msgstr ""
+msgstr "getpass kan inte öppna /dev/tty\n"
 
 #: ../newrole/newrole.c:354
 #, c-format
 msgid "Error initing capabilities, aborting.\n"
-msgstr ""
+msgstr "Fel vid initiering av kapabiliteter, avbryter.\n"
 
 #: ../newrole/newrole.c:367
 #, c-format
@@ -50,12 +68,12 @@
 #: ../newrole/newrole.c:374
 #, c-format
 msgid "Error changing uid, aborting.\n"
-msgstr ""
+msgstr "Fel vid byte av uid, avbryter.\n"
 
 #: ../newrole/newrole.c:380
 #, c-format
 msgid "Error resetting KEEPCAPS, aborting\n"
-msgstr ""
+msgstr "Fel vid ÄterstÀllning av KEEPCAPS, avbryter\n"
 
 #: ../newrole/newrole.c:386
 #, c-format
@@ -65,7 +83,7 @@
 #: ../newrole/newrole.c:459
 #, c-format
 msgid "Sorry, newrole may be used only on a SELinux kernel.\n"
-msgstr ""
+msgstr "TyvÀrr, newrole kan endast anvÀndas pÄ en SELinux-kÀrna.\n"
 
 #: ../newrole/newrole.c:464
 #, c-format
@@ -80,7 +98,7 @@
 #: ../newrole/newrole.c:490
 #, c-format
 msgid "Error: multiple types specified\n"
-msgstr ""
+msgstr "Fel: flera typer angivna\n"
 
 #: ../newrole/newrole.c:498
 #, c-format
@@ -90,82 +108,82 @@
 #: ../newrole/newrole.c:503
 #, c-format
 msgid "Error: multiple levels specified\n"
-msgstr ""
+msgstr "Fel: flera nivÄer angivna\n"
 
 #: ../newrole/newrole.c:527
 #, c-format
 msgid "Couldn't get default type.\n"
-msgstr ""
+msgstr "Kunde inte fÄ tag i standardtyp.\n"
 
 #: ../newrole/newrole.c:549
 #, c-format
 msgid "failed to get old_context.\n"
-msgstr ""
+msgstr "kunde inte fÄ tag i old_context.\n"
 
 #: ../newrole/newrole.c:563
 #, c-format
 msgid "failed to get new context.\n"
-msgstr ""
+msgstr "misslyckades med att fÄ tag i nytt sammanhang.\n"
 
 #: ../newrole/newrole.c:586
 #, c-format
 msgid "cannot find your entry in the passwd file.\n"
-msgstr ""
+msgstr "kan inte hitta din post i passwd-filen.\n"
 
 #: ../newrole/newrole.c:596
 #, c-format
 msgid "Error!  Shell is not valid.\n"
-msgstr ""
+msgstr "Fel! Skalet Àr inte giltigt.\n"
 
 #: ../newrole/newrole.c:603
 #, c-format
 msgid "Error!  Could not retrieve tty information.\n"
-msgstr ""
+msgstr "Fel! Kunde inte fÄ tag i tty-information.\n"
 
 #: ../newrole/newrole.c:607
 #, c-format
 msgid "Authenticating %s.\n"
-msgstr ""
+msgstr "Autentiserar %s.\n"
 
 #: ../newrole/newrole.c:621
 #, c-format
 msgid "newrole: incorrect password for %s\n"
-msgstr ""
+msgstr "newrole: felaktigt lösenord för %s\n"
 
 #: ../newrole/newrole.c:645
 #, c-format
 msgid "failed to set new role %s\n"
-msgstr ""
+msgstr "misslyckades med att stÀlla in ny roll %s\n"
 
 #: ../newrole/newrole.c:657
 #, c-format
 msgid "failed to set new type %s\n"
-msgstr ""
+msgstr "misslyckades med att stÀlla in ny typ %s\n"
 
 #: ../newrole/newrole.c:670
 #, c-format
 msgid "failed to build new range with level %s\n"
-msgstr ""
+msgstr "misslyckades med att bygga nytt intervall med nivÄ %s\n"
 
 #: ../newrole/newrole.c:674
 #, c-format
 msgid "failed to set new range %s\n"
-msgstr ""
+msgstr "misslyckades med att sÀtta nytt intervall %s\n"
 
 #: ../newrole/newrole.c:688
 #, c-format
 msgid "failed to convert new context to string\n"
-msgstr ""
+msgstr "misslyckades med att konvertera nytt sammanhang till strÀng\n"
 
 #: ../newrole/newrole.c:698
 #, c-format
 msgid "%s is not a valid context\n"
-msgstr ""
+msgstr "%s Àr inte ett giltigt sammanhang\n"
 
 #: ../newrole/newrole.c:711
 #, c-format
 msgid "Error!  Could not open %s.\n"
-msgstr ""
+msgstr "Fel! Kunde inte öppna %s.\n"
 
 #: ../newrole/newrole.c:717
 #, c-format
@@ -205,7 +223,7 @@
 #: ../newrole/newrole.c:832 ../run_init/run_init.c:390
 #, c-format
 msgid "Could not set exec context to %s.\n"
-msgstr ""
+msgstr "Kunde inte stÀlla in körningssammanhang till %s.\n"
 
 #: ../newrole/newrole.c:842
 #, c-format
@@ -241,12 +259,12 @@
 #: ../run_init/run_init.c:295
 #, c-format
 msgid "Could not open file %s\n"
-msgstr ""
+msgstr "Kunde inte öppna filen %s\n"
 
 #: ../run_init/run_init.c:322
 #, c-format
 msgid "No context in file %s\n"
-msgstr ""
+msgstr "Inget sammanhang i filen %s\n"
 
 #: ../run_init/run_init.c:345
 #, c-format
@@ -256,11 +274,11 @@
 #: ../run_init/run_init.c:364
 #, c-format
 msgid "authentication failed.\n"
-msgstr ""
+msgstr "autentisering misslyckades.\n"
 
 #: ../scripts/chcat:70 ../scripts/chcat:140
 msgid "Requires at least one category"
-msgstr ""
+msgstr "KrÀver minst en kategori"
 
 #: ../scripts/chcat:84 ../scripts/chcat:154
 #, c-format
@@ -270,12 +288,12 @@
 #: ../scripts/chcat:88
 #, c-format
 msgid "%s is already in %s"
-msgstr ""
+msgstr "%s Àr redan i %s"
 
 #: ../scripts/chcat:159 ../scripts/chcat:169
 #, c-format
 msgid "%s is not in %s"
-msgstr ""
+msgstr "%s finns inte i %s"
 
 #: ../scripts/chcat:232 ../scripts/chcat:237
 msgid "Can not combine +/- with other types of categories"
@@ -283,47 +301,80 @@
 
 #: ../scripts/chcat:282
 msgid "Can not have multiple sensitivities"
-msgstr ""
+msgstr "Kan inte ha flera kÀnsligheter"
 
 #: ../scripts/chcat:288
 #, c-format
 msgid "Usage %s CATEGORY File ..."
-msgstr ""
+msgstr "AnvÀndning %s KATEGORI fil ..."
+
+msgid "Usage: %s CATEGORY File ..."
+msgstr "AnvÀndning: %s KATEGORI fil ..."
 
 #: ../scripts/chcat:289
 #, c-format
 msgid "Usage %s -l CATEGORY user ..."
-msgstr ""
+msgstr "AnvÀndning %s -l KATEGORI anvÀndare ..."
+
+msgid "Usage: %s -l CATEGORY user ..."
+msgstr "AnvÀndning: %s -l KATEGORI anvÀndare ..."
 
 #: ../scripts/chcat:290
-#, c-format
+#, c-forma
 msgid "Usage %s [[+|-]CATEGORY],...]q File ..."
-msgstr ""
+msgstr "AnvÀndning %s [[+|-]KATEGORI],...]q fil ..."
+
+msgid "Usage: %s [[+|-]CATEGORY],...]q File ..."
+msgstr "AnvÀndning: %s [[+|-]KATEGORI],...]q fil ..."
 
 #: ../scripts/chcat:291
 #, c-format
 msgid "Usage %s -l [[+|-]CATEGORY],...]q user ..."
-msgstr ""
+msgstr "AnvÀndning %s -l [[+|-]KATEGORI],...]q anvÀndare ..."
+
+msgid "Usage: %s -l [[+|-]CATEGORY],...]q user ..."
+msgstr "AnvÀndning: %s -l [[+|-]KATEGORI],...]q anvÀndare ..."
 
 #: ../scripts/chcat:292
 #, c-format
 msgid "Usage %s -d File ..."
-msgstr ""
+msgstr "AnvÀndning %s -d fil ..."
+
+msgid "Usage: %s -d File ..."
+msgstr "AnvÀndning: %s -d fil ..."
 
 #: ../scripts/chcat:293
 #, c-format
 msgid "Usage %s -l -d user ..."
-msgstr ""
+msgstr "AnvÀndning %s -l -d anvÀndare ..."
+
+msgid "Usage: %s -l -d user ..."
+msgstr "AnvÀndning: %s -l -d anvÀndare ..."
 
 #: ../scripts/chcat:294
 #, c-format
 msgid "Usage %s -L"
-msgstr ""
+msgstr "AnvÀndning %s -L"
+
+msgid "Usage: %s -L"
+msgstr "AnvÀndning: %s -L"
+
+msgid "Usage: %s"
+msgstr "AnvÀndning: %s"
+
+msgid "Usage:  %s"
+msgstr "AnvÀndning: %s"
+
+msgid "Usage:"
+msgstr "AnvÀndning:"
 
 #: ../scripts/chcat:295
 #, c-format
 msgid "Usage %s -L -l user"
-msgstr ""
+msgstr "AnvÀndning %s -L -l anvÀndare"
+
+msgid "Usage: %s -L -l user"
+msgstr "AnvÀndning: %s -L -l anvÀndare"
 
 #: ../scripts/chcat:296
 msgid "Use -- to end option list.  For example"
@@ -344,7 +395,7 @@
 #: ../semanage/semanage:127
 #, c-format
 msgid "%s not defined"
-msgstr ""
+msgstr "%s Àr inte definierad"
 
 #: ../semanage/semanage:151
 #, c-format
@@ -357,50 +408,60 @@
 
 #: ../semanage/semanage:244
 msgid "You must specify a role"
-msgstr ""
+msgstr "Du mÄste ange en roll"
 
 #: ../semanage/semanage:246
 msgid "You must specify a prefix"
-msgstr ""
+msgstr "Du mÄste ange ett prefix"
 
 #: ../semanage/semanage:295
 #, c-format
 msgid "Options Error %s "
-msgstr ""
+msgstr "Flaggfel %s "
+
+msgid "Options Error %s"
+msgstr "Flaggfel %s"
 
 #: ../semanage/semanage:299
 #, c-format
 msgid "Invalid value %s"
-msgstr ""
+msgstr "Ogiltigt vÀrde %s"
 
 #: ../semanage/seobject.py:124
 msgid "translations not supported on non-MLS machines"
-msgstr ""
+msgstr "översÀttningar stöds inte pÄ maskiner som inte har MLS"
 
 #: ../semanage/seobject.py:131
 #, python-format
 msgid "Unable to open %s: translations not supported on non-MLS machines"
 msgstr ""
+"Kan inte öppna %s: översÀttningar stöds inte pÄ maskiner som inte har MLS"
 
 #: ../semanage/seobject.py:171 ../semanage/seobject.py:185
 #, python-format
 msgid "Translations can not contain spaces '%s' "
-msgstr ""
+msgstr "ÖversĂ€ttningar kan inte innehĂ„lla blanksteg \"%s\" "
+
+msgid "Translations can not contain spaces '%s'"
+msgstr "ÖversĂ€ttningar kan inte innehĂ„lla blanksteg \"%s\""
 
 #: ../semanage/seobject.py:174
 #, python-format
 msgid "Invalid Level '%s' "
-msgstr ""
+msgstr "Ogiltig nivÄ \"%s\" "
+
+msgid "Invalid Level '%s'"
+msgstr "Ogiltig nivÄ \"%s\""
 
 #: ../semanage/seobject.py:177
 #, python-format
 msgid "%s already defined in translations"
-msgstr ""
+msgstr "%s Àr redan definierad i översÀttningar"
 
 #: ../semanage/seobject.py:189
 #, python-format
 msgid "%s not defined in translations"
-msgstr ""
+msgstr "%s Àr inte definierad i översÀttningar"
 
 #: ../semanage/seobject.py:209
 msgid "SELinux policy is not managed or store cannot be accessed."
@@ -408,7 +469,7 @@
 
 #: ../semanage/seobject.py:214
 msgid "Cannot read policy store."
-msgstr ""
+msgstr "Kan inte lÀsa policylager."
 
 #: ../semanage/seobject.py:219
 msgid "Could not establish semanage connection"
@@ -421,38 +482,41 @@
 #: ../semanage/seobject.py:1188 ../semanage/seobject.py:1222
 #, python-format
 msgid "Could not create a key for %s"
-msgstr ""
+msgstr "Kunde inte skapa en nyckel för %s"
 
 #: ../semanage/seobject.py:242 ../semanage/seobject.py:300
 #: ../semanage/seobject.py:347 ../semanage/seobject.py:353
 #, python-format
 msgid "Could not check if login mapping for %s is defined"
-msgstr ""
+msgstr "Kunde inte kontrollera om inloggningsmappningen för %s Àr definierad"
 
 #: ../semanage/seobject.py:244
 #, python-format
 msgid "Login mapping for %s is already defined"
-msgstr ""
+msgstr "Inloggningsmappningen för %s Àr redan definierad"
 
 #: ../semanage/seobject.py:248
 #, python-format
 msgid "Linux User %s does not exist"
-msgstr ""
+msgstr "LinuxanvÀndaren %s finns inte"
+
+msgid "User %s does not exist"
+msgstr "AnvÀndaren %s finns inte"
 
 #: ../semanage/seobject.py:252
 #, python-format
 msgid "Could not create login mapping for %s"
-msgstr ""
+msgstr "Kunde inte skapa inloggningsmappning för %s"
 
 #: ../semanage/seobject.py:256 ../semanage/seobject.py:438
 #, python-format
 msgid "Could not set name for %s"
-msgstr ""
+msgstr "Kunde inte sÀtta namn för %s"
 
 #: ../semanage/seobject.py:261 ../semanage/seobject.py:448
 #, python-format
 msgid "Could not set MLS range for %s"
-msgstr ""
+msgstr "Kunde inte sÀtta MLS-intervall för %s"
 
 #: ../semanage/seobject.py:265
 #, python-format
@@ -469,16 +533,16 @@
 #: ../semanage/seobject.py:1135 ../semanage/seobject.py:1206
 #: ../semanage/seobject.py:1238
 msgid "Could not start semanage transaction"
-msgstr ""
+msgstr "Kunde inte starta semanage-transaktion"
 
 #: ../semanage/seobject.py:273 ../semanage/seobject.py:277
 #, python-format
 msgid "Could not add login mapping for %s"
-msgstr ""
+msgstr "Kunde inte lÀgga till inloggningsmappning för %s"
 
 #: ../semanage/seobject.py:292
 msgid "Requires seuser or serange"
-msgstr ""
+msgstr "KrÀver seuser eller serange"
 
 #: ../semanage/seobject.py:302 ../semanage/seobject.py:349
 #, python-format
@@ -507,7 +571,7 @@
 
 #: ../semanage/seobject.py:382
 msgid "Could not list login mappings"
-msgstr ""
+msgstr "Kunde inte lista inloggningsmappningar"
 
 #: ../semanage/seobject.py:428 ../semanage/seobject.py:497
 #: ../semanage/seobject.py:553 ../semanage/seobject.py:559
@@ -556,7 +620,7 @@
 
 #: ../semanage/seobject.py:489
 msgid "Requires prefix or roles"
-msgstr ""
+msgstr "KrÀver prefix eller roller"
 
 #: ../semanage/seobject.py:499 ../semanage/seobject.py:555
 #, python-format
@@ -598,16 +662,16 @@
 
 #: ../semanage/seobject.py:627
 msgid "Port is required"
-msgstr ""
+msgstr "Port krÀvs"
 
 #: ../semanage/seobject.py:638
 #, python-format
 msgid "Could not create a key for %s/%s"
-msgstr ""
+msgstr "Kunde inte skapa en nyckel för %s/%s"
 
 #: ../semanage/seobject.py:649
 msgid "Type is required"
-msgstr ""
+msgstr "Typ krÀvs"
 
 #: ../semanage/seobject.py:655 ../semanage/seobject.py:717
 #: ../semanage/seobject.py:751 ../semanage/seobject.py:757
@@ -623,12 +687,12 @@
 #: ../semanage/seobject.py:661
 #, python-format
 msgid "Could not create port for %s/%s"
-msgstr ""
+msgstr "Kunde inte skapa port för %s/%s"
 
 #: ../semanage/seobject.py:667
 #, python-format
 msgid "Could not create context for %s/%s"
-msgstr ""
+msgstr "Kunde inte skapa sammanhang för %s/%s"
 
 #: ../semanage/seobject.py:671
 #, python-format
@@ -666,7 +730,7 @@
 
 #: ../semanage/seobject.py:711
 msgid "Requires setype"
-msgstr ""
+msgstr "KrÀver setype"
 
 #: ../semanage/seobject.py:719 ../semanage/seobject.py:753
 #, python-format
@@ -695,7 +759,7 @@
 
 #: ../semanage/seobject.py:779 ../semanage/seobject.py:798
 msgid "Could not list ports"
-msgstr ""
+msgstr "Kunde inte lista portar"
 
 #: ../semanage/seobject.py:842 ../semanage/seobject.py:1014
 msgid "SELinux Type is required"
@@ -705,28 +769,28 @@
 #: ../semanage/seobject.py:947 ../semanage/seobject.py:1018
 #, python-format
 msgid "Could not create key for %s"
-msgstr ""
+msgstr "Kunde inte skapa nyckel för %s"
 
 #: ../semanage/seobject.py:850 ../semanage/seobject.py:914
 #: ../semanage/seobject.py:951 ../semanage/seobject.py:957
 #, python-format
 msgid "Could not check if interface %s is defined"
-msgstr ""
+msgstr "Kunde inte kontrollera om grÀnssnittet %s Àr definierat"
 
 #: ../semanage/seobject.py:852
 #, python-format
 msgid "Interface %s already defined"
-msgstr ""
+msgstr "GrÀnssnittet %s Àr redan definierat"
 
 #: ../semanage/seobject.py:856
 #, python-format
 msgid "Could not create interface for %s"
-msgstr ""
+msgstr "Kunde inte skapa grÀnssnitt för %s"
 
 #: ../semanage/seobject.py:861 ../semanage/seobject.py:1033
 #, python-format
 msgid "Could not create context for %s"
-msgstr ""
+msgstr "Kunde inte skapa sammanhang för %s"
 
 #: ../semanage/seobject.py:865
 #, python-format
@@ -761,22 +825,22 @@
 #: ../semanage/seobject.py:894 ../semanage/seobject.py:898
 #, python-format
 msgid "Could not add interface %s"
-msgstr ""
+msgstr "Kunde inte lÀgga till grÀnssnittet %s"
 
 #: ../semanage/seobject.py:916 ../semanage/seobject.py:953
 #, python-format
 msgid "Interface %s is not defined"
-msgstr ""
+msgstr "GrÀnssnittet %s Àr inte definierat"
 
 #: ../semanage/seobject.py:920
 #, python-format
 msgid "Could not query interface %s"
-msgstr ""
+msgstr "Kunde inte frÄga grÀnssnittet %s"
 
 #: ../semanage/seobject.py:935 ../semanage/seobject.py:939
 #, python-format
 msgid "Could not modify interface %s"
-msgstr ""
+msgstr "Kunde inte Àndra grÀnssnittet %s"
 
 #: ../semanage/seobject.py:959
 #, python-format
@@ -786,11 +850,11 @@
 #: ../semanage/seobject.py:967 ../semanage/seobject.py:971
 #, python-format
 msgid "Could not delete interface %s"
-msgstr ""
+msgstr "Kunde inte ta bort grÀnssnittet %s"
 
 #: ../semanage/seobject.py:979
 msgid "Could not list interfaces"
-msgstr ""
+msgstr "Kunde inte lista grÀnssnitt"
 
 #: ../semanage/seobject.py:1022 ../semanage/seobject.py:1084
 #: ../semanage/seobject.py:1123 ../semanage/seobject.py:1129
@@ -873,7 +937,7 @@
 
 #: ../semanage/seobject.py:1184
 msgid "Requires value"
-msgstr ""
+msgstr "KrÀver vÀrde"
 
 #: ../semanage/seobject.py:1192 ../semanage/seobject.py:1226
 #: ../semanage/seobject.py:1232
@@ -917,13 +981,18 @@
 
 #: ../audit2allow/audit2allow:184
 msgid "Compiling policy"
-msgstr ""
+msgstr "Kompilerar policy"
 
 #: ../audit2allow/audit2allow:195
 msgid ""
 "\n"
 "******************** IMPORTANT ***********************\n"
 msgstr ""
+"\n"
+"********************* VIKTIGT ************************\n"
+
+msgid "******************** IMPORTANT ***********************\n"
+msgstr "********************* VIKTIGT ************************\n"
 
 #: ../audit2allow/audit2allow:196
 #, c-format
@@ -938,4 +1007,7 @@
 #: ../audit2allow/audit2allow:203
 #, c-format
 msgid "Options Error: %s "
-msgstr ""
+msgstr "Flaggfel: %s "
+
+msgid "Options Error: %s"
+msgstr "Flaggfel: %s"
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/restorecond/restorecond.c policycoreutils-1.30.22/restorecond/restorecond.c
--- nsapolicycoreutils/restorecond/restorecond.c	2006-08-01 09:47:23.000000000 -0400
+++ policycoreutils-1.30.22/restorecond/restorecond.c	2006-08-01 09:55:14.000000000 -0400
@@ -436,9 +436,14 @@
 	/* Make sure we are root */
 	if (getuid() != 0) {
 		fprintf(stderr, "You must be root to run this program.\n");
-		return 4;
+		return 1;
 	}
 #endif
+	/* Make sure we are root */
+	if (is_selinux_enabled() != 1) {
+		fprintf(stderr, "Daemon requires SELinux be enabled to run.\n");
+		return 1;
+	}
 
 	/* Register sighandlers */
 	sa.sa_flags = 0;
diff --exclude-from=exclude -N -u -r nsapolicycoreutils/scripts/fixfiles policycoreutils-1.30.22/scripts/fixfiles
--- nsapolicycoreutils/scripts/fixfiles	2006-07-03 07:52:42.000000000 -0400
+++ policycoreutils-1.30.22/scripts/fixfiles	2006-08-01 09:53:54.000000000 -0400
@@ -234,7 +234,7 @@
 # Make sure they specified one of the three valid commands
 #
 case "$command" in
-    restore) restore -p -q ;;
+    restore) restore -p ;;
     check) restore -n -v ;;
     relabel) relabel;;
     *)