diff options
| author | John Sonnenschein <johns@joyent.com> | 2012-01-26 22:45:08 +0000 |
|---|---|---|
| committer | John Sonnenschein <johns@joyent.com> | 2012-01-26 22:45:08 +0000 |
| commit | 92fb61a58dea0e097df79e73d3cda1bef52c4339 (patch) | |
| tree | 8a9727b7a3600c29b261de4580520de19ec57e56 /usr/src/uts/common/fs | |
| parent | d6f90348d6442b80b8e77a4aaf217cbf86c54bdb (diff) | |
| parent | 6a5fc1386817167c00f9ee99bebd9ce35d434593 (diff) | |
| download | illumos-joyent-gcc4.tar.gz | |
Merge branch 'gcc4' of git.joyent.com:illumos-joyent into gcc4gcc4
Diffstat (limited to 'usr/src/uts/common/fs')
| -rw-r--r-- | usr/src/uts/common/fs/nfs/nfs_server.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/uts/common/fs/nfs/nfs_server.c b/usr/src/uts/common/fs/nfs/nfs_server.c index ad2fed01dc..8473788d8a 100644 --- a/usr/src/uts/common/fs/nfs/nfs_server.c +++ b/usr/src/uts/common/fs/nfs/nfs_server.c @@ -21,6 +21,7 @@ /* * Copyright (c) 1990, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011 Bayard G. Bell. All rights reserved. + * Copyright (c) 2012 Joyent, Inc. All rights reserved. */ /* @@ -2520,6 +2521,9 @@ nfs_srvinit(void) { int error; + if (getzoneid() != GLOBAL_ZONEID) + return (EACCES); + error = nfs_exportinit(); if (error != 0) return (error); |