6792084 smb_node_lookup should not take ownership of the hold on vnode passed as a parameter

6792299 winreg EnumKey should enumerate subkeys of any key
6582194 Replace getdents with readdir
6790756 smb_vss_lookup_nodes doesn't release its hold on vnode if smb_node_lookup fails
6791568 Solaris CIFS server only accepts pre-Windows 2000 user logon name
6793375 Unable to map a share with a user on a trusted domain
6796947 invalid assert in smb_vop_getattr
6581736 IPv6 support
6788345 smbadm list output only shows one trusted domain
6796594 Array overrun in libmlrpc
6797782 Need a SAM abstraction layer
6764696 Insufficient access while attempting to modify UserAccountControl attribute of a machine account
6798908 Refresh after enabling network interfaces should trigger DC discovery
6798825 Replace the smb_vop_readdir mechanism with the smb_odir_t object

2 files changed, 3 insertions, 45 deletions

diff --git a/usr/src/lib/libshare/smb/libshare_smb.c b/usr/src/lib/libshare/smb/libshare_smb.c
index fd9a951c8f..30e8ae088a 100644
--- a/usr/src/lib/libshare/smb/libshare_smb.c
+++ b/usr/src/lib/libshare/smb/libshare_smb.c
@@ -882,6 +882,8 @@ struct smb_proto_option_defs {
 	    string_length_check_validator, SMB_REFRESH_REFRESH },
 	{ SMB_CI_DYNDNS_ENABLE, 0, 0, true_false_validator, 0 },
 	{ SMB_CI_AUTOHOME_MAP, 0, MAX_VALUE_BUFLEN, path_validator, 0 },
+	{ SMB_CI_IPV6_ENABLE, 0, 0, true_false_validator,
+	    SMB_REFRESH_REFRESH },
 };
 
 #define	SMB_OPT_NUM \
diff --git a/usr/src/lib/libshare/smb/smb_share_doorclnt.c b/usr/src/lib/libshare/smb/smb_share_doorclnt.c
index 3232ce4868..e7a93507fa 100644
--- a/usr/src/lib/libshare/smb/smb_share_doorclnt.c
+++ b/usr/src/lib/libshare/smb/smb_share_doorclnt.c
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -368,50 +368,6 @@ smb_share_rename(char *from, char *to)
 }
 
 uint32_t
-smb_share_get(char *share_name, smb_share_t *si)
-{
-	door_arg_t *arg;
-	smb_dr_ctx_t *dec_ctx;
-	smb_dr_ctx_t *enc_ctx;
-	uint32_t rc;
-
-	if ((arg = smb_share_door_clnt_enter()) == NULL)
-		return (NERR_InternalError);
-
-	enc_ctx = smb_dr_encode_start(arg->data_ptr, SMB_SHARE_DSIZE);
-	smb_dr_put_uint32(enc_ctx, SMB_SHROP_GETINFO);
-	smb_dr_put_string(enc_ctx, share_name);
-
-	rc = smb_dr_encode_finish(enc_ctx, (unsigned int *)&arg->data_size);
-	if (rc != 0) {
-		smb_share_door_clnt_exit(arg, B_FALSE, "encode");
-		return (NERR_InternalError);
-	}
-
-	if (smb_share_door_call(smb_share_dfd, arg) < 0) {
-		smb_share_door_clnt_exit(arg, B_TRUE, "door call");
-		return (NERR_InternalError);
-	}
-
-	dec_ctx = smb_dr_decode_start(arg->data_ptr, arg->data_size);
-	if (smb_share_dchk(dec_ctx) != 0) {
-		(void) smb_dr_decode_finish(dec_ctx);
-		smb_share_door_clnt_exit(arg, B_FALSE, "decode");
-		return (NERR_InternalError);
-	}
-
-	rc = smb_dr_get_uint32(dec_ctx);
-	smb_dr_get_share(dec_ctx, si);
-	if (smb_dr_decode_finish(dec_ctx) != 0) {
-		smb_share_door_clnt_exit(arg, B_FALSE, "decode");
-		return (NERR_InternalError);
-	}
-
-	smb_share_door_clnt_exit(arg, B_FALSE, NULL);
-	return (rc);
-}
-
-uint32_t
 smb_share_create(smb_share_t *si)
 {
 	door_arg_t *arg;