From owner-p4-projects  Tue Sep 24 20:53:16 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 481AC37B404; Tue, 24 Sep 2002 20:53:14 -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 ECEE737B401
	for <perforce@FreeBSD.org>; Tue, 24 Sep 2002 20:53:13 -0700 (PDT)
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AD55943E6E
	for <perforce@FreeBSD.org>; Tue, 24 Sep 2002 20:53:13 -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 g8P3rDCo056181
	for <perforce@FreeBSD.org>; Tue, 24 Sep 2002 20:53:13 -0700 (PDT)
	(envelope-from amigus@FreeBSD.org)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.12.6/8.12.6/Submit) id g8P3rD3F056178
	for perforce@freebsd.org; Tue, 24 Sep 2002 20:53:13 -0700 (PDT)
Date: Tue, 24 Sep 2002 20:53:13 -0700 (PDT)
Message-Id: <200209250353.g8P3rD3F056178@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 18114 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=18114

Change 18114 by amigus@amigus_ganymede on 2002/09/24 20:52:43

	Tweak.

Affected files ...

.. //depot/projects/trustedbsd/misc/scripts/relabeluser#2 edit

Differences ...

==== //depot/projects/trustedbsd/misc/scripts/relabeluser#2 (text+ko) ====

@@ -7,20 +7,27 @@
 print "usage: $program <username> <label> <run-label>\n" and exit (1)
 if ($#ARGV != 2);
 
+$user = $ARGV[0];
+$label = $ARGV[1];
+$run_label = $ARGV[2];
+
+$dir = (getpwnam($user))[7];
+
 ($slabel) = ($label =~ /^(\S+\/\S+)\(.*\)$/);
 
 $command .= "/usr/local/sbin/mac_user_label.pl ";
 $command .= "--login-config-file /etc/login.conf ";
 $command .= "--user $user ";
-$command .= "--label $label ";
-$command .= "--tty-label $slabel";
+$command .= "--label \"$label\" ";
+$command .= "--tty-label \"$slabel\"";
 
 $ret = system($command);
 die "$program: failed to execute \'$command\': $!" if ($ret);
 
+$command = "";
 $command .= "/usr/local/sbin/mac_user_label.pl ";
-$command .= "--file-label $slabel ";
-$command .= "--run-label $run_label ";
+$command .= "--file-label \"$slabel\" ";
+$command .= "--run-label \"$run_label\" ";
 $command .= "--directory $dir";
 
 $ret = system($command);

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