PERFORCE change 107569 for review
Todd Miller
millert at FreeBSD.org
Mon Oct 9 12:36:01 PDT 2006
http://perforce.freebsd.org/chv.cgi?CH=107569
Change 107569 by millert at millert_g5tower on 2006/10/09 19:34:54
Enable code that was #ifdef notyet
Affected files ...
.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_context_list.c#3 edit
.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/query_user_context.c#3 edit
.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#3 edit
.. //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.c#4 edit
Differences ...
==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/get_context_list.c#3 (text+ko) ====
@@ -286,9 +286,7 @@
if (buf[plen - 1] == '\n')
buf[plen - 1] = 0;
-#ifdef notyet
retry:
-#endif
nlen = strlen(user) + 1 + plen + 1;
*newcon = malloc(nlen);
if (!(*newcon))
@@ -300,7 +298,6 @@
return -1;
}
-#ifdef notyet
/* If possible, check the context to catch
errors early rather than waiting until the
caller tries to use setexeccon on the context.
@@ -315,7 +312,6 @@
}
return -1;
}
-#endif
return 0;
}
==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/libselinux/src/query_user_context.c#3 (text+ko) ====
@@ -72,7 +72,6 @@
return 0;
}
-#ifdef notyet
/* get_field - given fieldstr - the "name" of a field, query the user
* and set the new value of the field
*/
@@ -179,5 +178,3 @@
return -1;
return 0;
}
-#endif
-
==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/newrole/newrole.c#3 (text+ko) ====
@@ -722,13 +722,10 @@
printf("Your new context is %s\n", new_context);
#endif
-#ifdef notyet
- /* XXX - no security_check_context() in SEBSD so far */
if (security_check_context(new_context) < 0) {
fprintf(stderr, _("%s is not a valid context\n"), new_context);
exit(-1);
}
-#endif
/*
*
==== //depot/projects/trustedbsd/sedarwin8/policies/sedarwin/policycoreutils/setfiles/setfiles.c#4 (text+ko) ====
@@ -414,7 +414,6 @@
if (policyfile) {
valid = (sepol_check_context(context) >= 0);
-#ifdef notyet
} else if (security_canonicalize_context_raw(context, &tmpcon) < 0) {
if (errno != ENOENT) {
valid = 0;
@@ -423,7 +422,6 @@
} else {
free(context);
*contextp = tmpcon;
-#endif
}
if (!valid) {
More information about the trustedbsd-cvs
mailing list