--- a/exception_lists/cstyle	Sun May 15 18:57:41 2011 -0600
+++ b/exception_lists/cstyle	Tue May 17 11:08:25 2011 -0400
@@ -508,6 +508,7 @@
 usr/src/lib/krb5/ss/ss.h
 usr/src/lib/krb5/ss/std_rqs.c
 usr/src/lib/krb5/ss/utils.c
+usr/src/lib/libgss/g_glue.c
 usr/src/lib/librstp/common/base.h
 usr/src/lib/librstp/common/choose.h
 usr/src/lib/librstp/common/edge.c
@@ -547,6 +548,7 @@
 usr/src/lib/librstp/common/uid_stp.h
 usr/src/lib/librstp/common/vector.c
 usr/src/lib/librstp/common/vector.h
+usr/src/uts/common/gssapi/gssapi.h
 usr/src/uts/common/gssapi/mechs/krb5/crypto/block_size.c
 usr/src/uts/common/gssapi/mechs/krb5/crypto/checksum_length.c
 usr/src/uts/common/gssapi/mechs/krb5/crypto/cksumtypes.c

--- a/usr/src/head/ldap.h	Sun May 15 18:57:41 2011 -0600
+++ b/usr/src/head/ldap.h	Tue May 17 11:08:25 2011 -0400
@@ -1,4 +1,5 @@
 /*
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2001-2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
@@ -28,8 +29,6 @@
 #ifndef	_LDAP_H
 #define	_LDAP_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #ifdef	__cplusplus
 extern "C" {
 #endif
@@ -655,6 +654,11 @@
 char ** ldap_get_reference_urls(LDAP *ld, LDAPMessage *res);
 #endif
 
+LDAP_API(void) LDAP_CALL ldap_add_result_entry(
+	LDAPMessage **list, LDAPMessage *e);
+LDAP_API(LDAPMessage *) LDAP_CALL ldap_delete_result_entry(
+	LDAPMessage **list, LDAPMessage *e);
+
 
 /* End of core standard C LDAP API definitions */
 

--- a/usr/src/lib/libgss/g_glue.c	Sun May 15 18:57:41 2011 -0600
+++ b/usr/src/lib/libgss/g_glue.c	Tue May 17 11:08:25 2011 -0400
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #include "mglueP.h"
@@ -256,12 +257,14 @@
  * peers. We include the OIDs here so we do not have to link
  * with the mechanism.
  */
-static gss_OID_desc gss_ntlm_mechanism_oid_desc =
-	{10, (void *)"\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a"};
-static gss_OID_desc gss_spnego_mechanism_oid_desc =
-	{6, (void *)"\x2b\x06\x01\x05\x05\x02"};
-static gss_OID_desc gss_krb5_mechanism_oid_desc =
-	{9, (void *)"\x2a\x86\x48\x86\xf7\x12\x01\x02\x02"};
+static const gss_OID_desc gss_ntlm_mechanism_oid_desc =
+	{10, "\x2b\x06\x01\x04\x01\x82\x37\x02\x02\x0a"};
+static const gss_OID_desc gss_spnego_mechanism_oid_desc =
+	{6, "\x2b\x06\x01\x05\x05\x02"};
+static const gss_OID_desc gss_krb5_mechanism_oid_desc =
+	{9, "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02"};
+const gss_OID_desc * const gss_mech_krb5 =
+	&gss_krb5_mechanism_oid_desc;
 
 #define NTLMSSP_SIGNATURE "NTLMSSP"
 

--- a/usr/src/lib/libgss/mapfile-vers	Sun May 15 18:57:41 2011 -0600
+++ b/usr/src/lib/libgss/mapfile-vers	Tue May 17 11:08:25 2011 -0400
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 #
 
 #
@@ -129,6 +130,7 @@
 	__gss_get_modOptions;
 	__gss_mech_qops;
 	__gss_mech_to_oid;
+	gss_mech_krb5;
 	gss_nt_exported_name;
 	gss_nt_service_name;
 	gss_nt_service_name_v2;

--- a/usr/src/lib/libldap5/mapfile-vers	Sun May 15 18:57:41 2011 -0600
+++ b/usr/src/lib/libldap5/mapfile-vers	Tue May 17 11:08:25 2011 -0400
@@ -20,6 +20,7 @@
 #
 #
 # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
 #
 
 #
@@ -224,6 +225,7 @@
 
 SYMBOL_VERSION SUNWprivate_1.1 {
     global:
+	ldap_add_result_entry;
 	ldap_charray_add;
 	ldap_charray_dup;
 	ldap_charray_inlist;
@@ -233,6 +235,7 @@
 	ldap_create_persistentsearch_control;
 	ldap_create_proxiedauth_control;
 	ldap_create_proxyauth_control;
+	ldap_delete_result_entry;
 	ldap_get_lderrno;
 	ldap_get_reference_urls;
 	ldaplogconfigf;

--- a/usr/src/uts/common/gssapi/gssapi_ext.h	Sun May 15 18:57:41 2011 -0600
+++ b/usr/src/uts/common/gssapi/gssapi_ext.h	Tue May 17 11:08:25 2011 -0400
@@ -19,6 +19,7 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
@@ -204,6 +205,12 @@
  */
 extern const gss_OID GSS_C_INQ_SSPI_SESSION_KEY;
 
+/*
+ * For compatability with other GSSAPI implementations.
+ * This is needed by Samba.
+ */
+extern const gss_OID_desc * const gss_mech_krb5;
+
 #else	/*	_KERNEL	*/
 
 OM_uint32