From owner-p4-projects  Tue Sep 24 20:24:40 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 19D4F37B404; Tue, 24 Sep 2002 20:24:38 -0700 (PDT)
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 BB2E837B401
	for <perforce@FreeBSD.org>; Tue, 24 Sep 2002 20:24:37 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 5C1D943E77
	for <perforce@FreeBSD.org>; Tue, 24 Sep 2002 20:24:37 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: from freefall.freebsd.org (perforce@localhost [127.0.0.1])
	by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id g8P3ObCo050399
	for <perforce@FreeBSD.org>; Tue, 24 Sep 2002 20:24:37 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P3Obda050396
	for perforce@freebsd.org; Tue, 24 Sep 2002 20:24:37 -0700 (PDT)
Date: Tue, 24 Sep 2002 20:24:37 -0700 (PDT)
Message-Id: <200209250324.g8P3Obda050396@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to amigus@FreeBSD.org using -f
From: Adam Migus <amigus@FreeBSD.org>
Subject: PERFORCE change 18110 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=18110

Change 18110 by amigus@amigus_ganymede on 2002/09/24 20:23:35

	Tweaking.

Affected files ...

.. //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#8 edit

Differences ...

==== //depot/projects/trustedbsd/misc/kmlsinstall/kmlsinstaller.cc#8 (text+ko) ====

@@ -275,12 +275,6 @@
 	error = system(sysbuf);
 	if (error)
 		fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error);
-	memset(sysbuf, NULL, sizeof (sysbuf));
-	p = sysbuf;
-	p = strcat(p, "touch /etc/.mac_installed");
-	error = system(sysbuf);
-	if (error)
-		fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error);
 
 	progressdialog->setLabelText("TrustedBSD MLS Installation\n"
 	    "Enable boot program");
@@ -316,28 +310,12 @@
 	p = sysbuf;
 	p = strcat(p, "mac_update_login_conf.pl ");
 	p = strcat(p, "--login-config-file /etc/login.conf ");
-	p = strcat(p, "--user root ");
+	p = strcat(p, "--user so ");
 	p = strcat(p, "--label \"mls/low(low-high)\" ");
 	p = strcat(p, "--tty-label \"mls/low\"");
 	error = system(sysbuf);
 	if (error)
 		fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error);
-	memset(sysbuf, NULL, sizeof (sysbuf));
-	p = sysbuf;
-	p = strcat(p, "mac_update_login_conf.pl ");
-	p = strcat(p, "--login-config-file /etc/login.conf ");
-	p = strcat(p, "--user so ");
-	p = strcat(p, "--label \"mls/high(low-high)\" ");
-	p = strcat(p, "--tty-label \"mls/high\"");
-	error = system(sysbuf);
-	if (error)
-		fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error);
-	memset(sysbuf, NULL, sizeof (sysbuf));
-	p = sysbuf;
-	p = strcat(p, "cap_mkdb /etc/login.conf");
-	error = system(sysbuf);
-	if (error)
-		fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error);
 
 	progressdialog->setLabelText("TrustedBSD MLS Installation\n"
 	    "Adding Security Officer account");
@@ -352,6 +330,13 @@
 	if (error)
 		fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error);
 
+	memset(sysbuf, NULL, sizeof (sysbuf));
+	p = sysbuf;
+	p = strcat(p, "touch /etc/.mac_installed");
+	error = system(sysbuf);
+	if (error)
+		fprintf(stderr, "\'%s\' returned %d\n", sysbuf, error);
+
 	progressdialog->setLabelText("TrustedBSD MLS Installation\n"
 	    "Install complete");
 	progressdialog->setProgress(8);

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message