diff options
| author | Sam Falkner <Sam.Falkner@Sun.COM> | 2010-02-25 11:47:05 -0700 |
|---|---|---|
| committer | Sam Falkner <Sam.Falkner@Sun.COM> | 2010-02-25 11:47:05 -0700 |
| commit | e4d060fb4c00d44cd578713eb9a921f594b733b8 (patch) | |
| tree | c38276f18cf33dbd25c1451f4d3a92ef8adfc6b3 /usr/src/lib/pyzfs/common/userspace.py | |
| parent | e69acc927b15c46de46ae637e53e1b808990a5bc (diff) | |
| download | illumos-joyent-e4d060fb4c00d44cd578713eb9a921f594b733b8.tar.gz | |
6895223 zfs userspace/groupspace/allow/unallow/holds IOError in Japanese locale
Diffstat (limited to 'usr/src/lib/pyzfs/common/userspace.py')
| -rw-r--r-- | usr/src/lib/pyzfs/common/userspace.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr/src/lib/pyzfs/common/userspace.py b/usr/src/lib/pyzfs/common/userspace.py index 6444dbc8c1..16a4f4cafb 100644 --- a/usr/src/lib/pyzfs/common/userspace.py +++ b/usr/src/lib/pyzfs/common/userspace.py @@ -19,7 +19,7 @@ # # CDDL HEADER END # -# Copyright 2009 Sun Microsystems, Inc. All rights reserved. +# Copyright 2010 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -31,6 +31,7 @@ import sys import pwd import grp import errno +import solaris.misc import zfs.util import zfs.ioctl import zfs.dataset @@ -68,9 +69,9 @@ def new_entry(options, isgroup, domain, rid): idstr = "%u" % rid (typename, mapfunc) = { - (1, 1): ("SMB Group", lambda id: zfs.ioctl.sid_to_name(id, 0)), + (1, 1): ("SMB Group", lambda id: solaris.misc.sid_to_name(id, 0)), (1, 0): ("POSIX Group", lambda id: grp.getgrgid(int(id)).gr_name), - (0, 1): ("SMB User", lambda id: zfs.ioctl.sid_to_name(id, 1)), + (0, 1): ("SMB User", lambda id: solaris.misc.sid_to_name(id, 1)), (0, 0): ("POSIX User", lambda id: pwd.getpwuid(int(id)).pw_name) }[isgroup, bool(domain)] @@ -109,7 +110,7 @@ def process_one_raw(acct, options, prop, elem): if options.translate and domain: try: - rid = zfs.ioctl.sid_to_id("%s-%u" % (domain, rid), + rid = solaris.misc.sid_to_id("%s-%u" % (domain, rid), not isgroup) domain = None except KeyError: @@ -203,7 +204,7 @@ def do_userspace(): ds = zfs.dataset.Dataset(dsname, types=("filesystem")) - if ds.getprop("zoned") and zfs.ioctl.isglobalzone(): + if ds.getprop("zoned") and solaris.misc.isglobalzone(): options.noname = True if not ds.getprop("useraccounting"): |