diff -Naurp --exclude-from excludes old/policycoreutils/semanage/semanage new/policycoreutils/semanage/semanage
--- old/policycoreutils/semanage/semanage	2005-12-24 15:24:02.000000000 -0500
+++ new/policycoreutils/semanage/semanage	2005-12-24 15:58:45.000000000 -0500
@@ -50,9 +50,10 @@ class loginRecords:
 
 	def modify(self, name, sename="", serange=""):
 		(rc,k)=semanage_seuser_key_create(self.sh, name)
-		(rc,u)= semanage_seuser_query(self.sh, k)
-		if rc !=0 :
+		(rc,exists) = semanage_seuser_exists(self.sh, k)
+		if not exists:
 			raise ValueError("SELinux user %s mapping is not defined." % name)
+		(rc,u)= semanage_seuser_query(self.sh, k)
 		if sename == "" and serange=="":
 			raise ValueError("Requires, seuser or serange")
 		if serange != "":
@@ -68,7 +69,7 @@ class loginRecords:
 	def delete(self, name):
 		(rc,k)=semanage_seuser_key_create(self.sh, name)
 		(rc,exists)= semanage_seuser_exists(self.sh, k)
-		if rc !=0 :
+		if not exists:
 			raise ValueError("SELinux user %s mapping is not defined." % name)
 		semanage_begin_transaction(self.sh)
 		semanage_seuser_del(self.sh, k)
@@ -117,8 +118,6 @@ class seluserRecords:
 		if not exists:
 			raise ValueError("user %s is not defined" % name)
 		(rc,u)= semanage_user_query(self.sh, k)
-		if rc !=0 :
-			raise ValueError("User %s is not defined." % name)
 		if len(roles) == 0  and serange=="" and selevel=="":
 			raise ValueError("Requires, roles, level  or range")
 		if serange != "":
@@ -133,7 +132,6 @@ class seluserRecords:
 		semanage_user_modify_local(self.sh, k, u)
 		if semanage_commit(self.sh) != 0:
 			raise ValueError("Failed to modify SELinux user")
-
 		
 	def delete(self, name):
 		(rc,k)=semanage_user_key_create(self.sh, name)
@@ -251,8 +249,8 @@ semanage port [-admth] SELINUX_PORT_NAME
 		objectlist=("login", "user", "port")
 		input=sys.stdin
 		output=sys.stdout
-		serange="s0"
-		selevel="s0"
+		serange=""
+		selevel=""
 		roles=""
 		seuser=""
 		type=""