[Selinux-commits] SF.net SVN: selinux: [2675] branches/stable/1_0

[<ssm...@us...>]

Revision: 2675
          http://selinux.svn.sourceforge.net/selinux/?rev=2675&view=rev
Author:   ssmalley
Date:     2007-11-05 11:10:24 -0800 (Mon, 05 Nov 2007)

Log Message:
-----------
applied r2672:2674 from trunk

Modified Paths:
--------------
    branches/stable/1_0/libsemanage/src/semanage_store.c
    branches/stable/1_0/libsepol/src/link.c

Modified: branches/stable/1_0/libsemanage/src/semanage_store.c
===================================================================
--- branches/stable/1_0/libsemanage/src/semanage_store.c	2007-11-05 19:09:04 UTC (rev 2674)
+++ branches/stable/1_0/libsemanage/src/semanage_store.c	2007-11-05 19:10:24 UTC (rev 2675)
@@ -547,7 +547,7 @@
 		free(namelist[i]);
 	}
 	free(namelist);
-	if (remove(path) == -1) {
+	if (rmdir(path) == -1) {
 		return -4;
 	}
 	return 0;

Modified: branches/stable/1_0/libsepol/src/link.c
===================================================================
--- branches/stable/1_0/libsepol/src/link.c	2007-11-05 19:09:04 UTC (rev 2674)
+++ branches/stable/1_0/libsepol/src/link.c	2007-11-05 19:10:24 UTC (rev 2675)
@@ -695,6 +695,12 @@
 		return -1;
 	}
 
+	if (!strcmp(id, target_id)) {
+		ERR(state->handle, "%s: Self aliasing of %s.",
+		    state->cur_mod_name, id);
+		return -1;
+	}
+
 	base_type = hashtab_search(state->base->p_types.table, id);
 	if (base_type == NULL) {
 		if (state->verbose)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.