diff options
| author | jmcp <James.McPherson@Sun.COM> | 2010-06-10 16:27:13 -0700 |
|---|---|---|
| committer | jmcp <James.McPherson@Sun.COM> | 2010-06-10 16:27:13 -0700 |
| commit | bfbb13c994c87d0453ca6bb826470ec99a909992 (patch) | |
| tree | ee27888ec698913e010e5b7b7bf487b6ce3f21f6 /usr/src/lib/libshare | |
| parent | 44f92b7dbae22574cbeb46a120d108f45d9e2f29 (diff) | |
| download | illumos-gate-bfbb13c994c87d0453ca6bb826470ec99a909992.tar.gz | |
backout 6930814: causes 6960023
Diffstat (limited to 'usr/src/lib/libshare')
| -rw-r--r-- | usr/src/lib/libshare/common/libshare.c | 3 | ||||
| -rw-r--r-- | usr/src/lib/libshare/common/libshare.h | 1 | ||||
| -rw-r--r-- | usr/src/lib/libshare/nfs/libshare_nfs.c | 8 |
3 files changed, 3 insertions, 9 deletions
diff --git a/usr/src/lib/libshare/common/libshare.c b/usr/src/lib/libshare/common/libshare.c index 1d17d5fea7..30c2c486f1 100644 --- a/usr/src/lib/libshare/common/libshare.c +++ b/usr/src/lib/libshare/common/libshare.c @@ -221,9 +221,6 @@ sa_errorstr(int err) case SA_PASSWORD_ENC: ret = dgettext(TEXT_DOMAIN, "passwords must be encrypted"); break; - case SA_SHARE_EXISTS: - ret = dgettext(TEXT_DOMAIN, "path or file is already shared"); - break; default: (void) snprintf(errstr, sizeof (errstr), dgettext(TEXT_DOMAIN, "unknown %d"), err); diff --git a/usr/src/lib/libshare/common/libshare.h b/usr/src/lib/libshare/common/libshare.h index 283a499a8e..5d32f60e8f 100644 --- a/usr/src/lib/libshare/common/libshare.h +++ b/usr/src/lib/libshare/common/libshare.h @@ -87,7 +87,6 @@ typedef void *sa_handle_t; /* opaque handle to access core functions */ #define SA_NO_SUCH_SECTION 30 /* no section found */ #define SA_NO_PROPERTIES 31 /* no properties found */ #define SA_PASSWORD_ENC 32 /* passwords must be encrypted */ -#define SA_SHARE_EXISTS 33 /* path or file is already shared */ /* API Initialization */ #define SA_INIT_SHARE_API 0x0001 /* init share specific interface */ diff --git a/usr/src/lib/libshare/nfs/libshare_nfs.c b/usr/src/lib/libshare/nfs/libshare_nfs.c index 3173e47d7f..6a9f7fafba 100644 --- a/usr/src/lib/libshare/nfs/libshare_nfs.c +++ b/usr/src/lib/libshare/nfs/libshare_nfs.c @@ -20,7 +20,8 @@ */ /* - * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ /* @@ -1951,10 +1952,7 @@ nfs_enable_share(sa_share_t share) break; } err = SA_NO_PERMISSION; - break; - case EEXIST: - err = SA_SHARE_EXISTS; - break; + /* FALLTHROUGH */ default: break; } |