From 36d41b68ce4ecc38f01ced5fe21dddf05a5f9289 Mon Sep 17 00:00:00 2001 From: Nathan Bush Date: Tue, 3 Nov 2009 17:06:24 -0800 Subject: 6863533 TX Device Allocation Manager shows devices to allocate to users without appropriate rights 6881589 incorrect variable name in audio_clean 6874590 TX does not update logindevperm correctly for virtual console feature --- usr/src/cmd/allocate/allocate3.c | 9 ++------- usr/src/cmd/allocate/audio_clean.sh | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'usr/src/cmd/allocate') diff --git a/usr/src/cmd/allocate/allocate3.c b/usr/src/cmd/allocate/allocate3.c index 7db62883dc..521a5f541f 100644 --- a/usr/src/cmd/allocate/allocate3.c +++ b/usr/src/cmd/allocate/allocate3.c @@ -20,12 +20,10 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include #include #include @@ -363,10 +361,7 @@ _list_device(int optflag, uid_t uid, devalloc_t *da, char *zonename) error = DACACCERR; goto out; } - if (optflag & USERID) - is_authorized = 1; - else - is_authorized = _is_dev_authorized(da, uid); + is_authorized = _is_dev_authorized(da, uid); if (optflag & LISTFREE) { /* list_devices -n */ /* * list all free devices diff --git a/usr/src/cmd/allocate/audio_clean.sh b/usr/src/cmd/allocate/audio_clean.sh index 24ccea7fdb..5f9531a77a 100644 --- a/usr/src/cmd/allocate/audio_clean.sh +++ b/usr/src/cmd/allocate/audio_clean.sh @@ -136,7 +136,7 @@ fi ZONENAME=$4 ZONEPATH=$5 SAVEDIR=/etc/security/audio -MAP=`dminfo -v -n $AUDIO` +MAP=`dminfo -v -n $DEVICE` DEVICE=`echo $MAP | cut -f1 -d:` TYPE=`echo $MAP | cut -f2 -d:` FILES=`echo $MAP | cut -f3 -d:` -- cgit v1.2.3