PERFORCE change 18110 for review

[Adam Migus]

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

Change 18110 by amigus at 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 at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message