diff options
| author | Nathan Bush <nathan.bush@sun.com> | 2009-11-03 17:06:24 -0800 |
|---|---|---|
| committer | Nathan Bush <nathan.bush@sun.com> | 2009-11-03 17:06:24 -0800 |
| commit | 36d41b68ce4ecc38f01ced5fe21dddf05a5f9289 (patch) | |
| tree | 49c3bbde2dcba9e02db08a52b9b221375c55d669 /usr | |
| parent | 480c35031423cbc3459570008fa24090563911d3 (diff) | |
| download | illumos-joyent-36d41b68ce4ecc38f01ced5fe21dddf05a5f9289.tar.gz | |
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
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/src/cmd/allocate/allocate3.c | 9 | ||||
| -rw-r--r-- | usr/src/cmd/allocate/audio_clean.sh | 2 | ||||
| -rw-r--r-- | usr/src/cmd/tsol/labeld/svc-labeld | 14 |
3 files changed, 10 insertions, 15 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:` diff --git a/usr/src/cmd/tsol/labeld/svc-labeld b/usr/src/cmd/tsol/labeld/svc-labeld index f53ef3a393..de61db3051 100644 --- a/usr/src/cmd/tsol/labeld/svc-labeld +++ b/usr/src/cmd/tsol/labeld/svc-labeld @@ -19,10 +19,9 @@ # # CDDL HEADER END # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "%Z%%M% %I% %E% SMI" . /lib/svc/share/smf_include.sh @@ -61,12 +60,13 @@ rewrite_logindev() return fi for line in \ - "/dev/console 0600 /dev/sound/" \ - "/dev/console 0400 /dev/removable-media/" \ - "/dev/console 0400 /dev/hotpluggable/" \ - "/dev/console 0600 /dev/usb/\[0-9a-f\]" \ + "/dev/sound/" \ + "/dev/removable-media/" \ + "/dev/hotpluggable/" \ + "/dev/usb/\[0-9a-f\]" \ ; do - sed -e "s!^$from$line!$to$line!" $LOGINDEVPERM > /tmp/tmp.$$ + sed -e "s!^$from\([^# ]\{1,\}[ }\{1,\}[0-9]\{1,\}[ ]\{1,\}\)$line!$to\1$line!" \ + $LOGINDEVPERM > /tmp/tmp.$$ cp /tmp/tmp.$$ $LOGINDEVPERM done rm -f /tmp/tmp.$$ |