diff options
Diffstat (limited to 'usr/src/cmd/allocate')
| -rw-r--r-- | usr/src/cmd/allocate/allocate3.c | 9 | ||||
| -rw-r--r-- | usr/src/cmd/allocate/audio_clean.sh | 2 |
2 files changed, 3 insertions, 8 deletions
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 <auth_attr.h> #include <auth_list.h> #include <dirent.h> @@ -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:` |