From owner-p4-projects@FreeBSD.ORG  Mon Oct  9 19:35:44 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C121916A412; Mon,  9 Oct 2006 19:35:44 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9B68A16A407
	for <perforce@freebsd.org>; Mon,  9 Oct 2006 19:35:44 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 18CC643D58
	for <perforce@freebsd.org>; Mon,  9 Oct 2006 19:35:44 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k99JZhN6094101
	for <perforce@freebsd.org>; Mon, 9 Oct 2006 19:35:43 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k99JZhRO094092
	for perforce@freebsd.org; Mon, 9 Oct 2006 19:35:43 GMT
	(envelope-from millert@freebsd.org)
Date: Mon, 9 Oct 2006 19:35:43 GMT
Message-Id: <200610091935.k99JZhRO094092@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 107569 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Oct 2006 19:35:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=107569

Change 107569 by millert@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) {