summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniil Lunev <daniil.lunev@nexenta.com>2012-11-30 11:07:19 +0000
committerGordon Ross <gwr@nexenta.com>2014-11-10 22:42:09 -0500
commitf4427914317470f516ca69daaed90f7efb3d76dc (patch)
treea3e5b89151a25c9cd8a8d111a545a1ec07cf6b05
parentf9bc6dadd79442185db5c8eb201c7475554fc7d7 (diff)
downloadillumos-joyent-f4427914317470f516ca69daaed90f7efb3d76dc.tar.gz
5216 failover error: cannot share pool/folder - smb add share failed
Reviewed by: Gordon Ross <gwr@nexenta.com> Reviewed by: Vitaliy Gusev <vitaliy.gusev@nexenta.com> Reviewed by: Boris Protopopov <boris.protopopov@nexenta.com> Approved by: Robert Mustacchi <rm@joyent.com>
-rw-r--r--usr/src/lib/libshare/smb/libshare_smb.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/usr/src/lib/libshare/smb/libshare_smb.c b/usr/src/lib/libshare/smb/libshare_smb.c
index 86fd29bada..960f26a7a5 100644
--- a/usr/src/lib/libshare/smb/libshare_smb.c
+++ b/usr/src/lib/libshare/smb/libshare_smb.c
@@ -451,12 +451,6 @@ smb_enable_share(sa_share_t share)
if (err != SA_OK) {
(void) printf(dgettext(TEXT_DOMAIN,
"SMB: Unable to enable service\n"));
- /*
- * For now, it is OK to not be able to enable
- * the service.
- */
- if (err == SA_BUSY || err == SA_SYSTEM_ERR)
- err = SA_OK;
} else {
online = B_TRUE;
}
@@ -1484,10 +1478,6 @@ smb_enable_service(void)
/* maintenance requires help */
ret = SA_SYSTEM_ERR;
break;
- } else if (smb_isdisabled()) {
- /* disabled is ok */
- ret = SA_OK;
- break;
} else {
/* try another time */
ret = SA_BUSY;