Illumos Sync

Merge github.com:illumos/illumos-gate

Conflicts:
	exception_lists/check_rtime
	usr/src/Makefile.master
	usr/src/Makefile.master.64
	usr/src/cmd/Makefile
	usr/src/cmd/lms/Makefile
	usr/src/cmd/lp/Makefile.lp
	usr/src/cmd/mdb/Makefile.mdb
	usr/src/cmd/mdb/common/mdb/mdb_cmds.c
	usr/src/cmd/mdb/common/mdb/mdb_print.c
	usr/src/cmd/mdb/common/mdb/mdb_print.h
	usr/src/cmd/mdb/common/mdb/mdb_tab.c
	usr/src/cmd/mdb/common/mdb/mdb_termio.c
	usr/src/cmd/mdb/common/mdb/mdb_whatis.c
	usr/src/cmd/svc/svccfg/svccfg_libscf.c
	usr/src/cmd/zpool/zpool_main.c
	usr/src/lib/Makefile
	usr/src/lib/libc/inc/thr_inlines.h
	usr/src/lib/libc/port/mapfile-vers
	usr/src/lib/libc/sparc/Makefile.com
	usr/src/lib/libc/sparc/crt/_rtld.c
	usr/src/lib/libc/sparcv9/Makefile.com
	usr/src/lib/libdtrace/common/dt_open.c
	usr/src/lib/libdtrace/common/dt_options.c
	usr/src/lib/libumem/common/envvar.c
	usr/src/lib/libumem/common/vmem_base.c
	usr/src/lib/libzfs/common/libzfs_impl.h
	usr/src/lib/libzfs/common/libzfs_iter.c
	usr/src/lib/libzfs/common/libzfs_util.c
	usr/src/lib/libzfs/common/mapfile-vers
	usr/src/lib/sun_fc/Makefile.com
	usr/src/lib/sun_fc/amd64/Makefile
	usr/src/lib/sun_fc/sparcv9/Makefile
	usr/src/man/man1m/Makefile
	usr/src/uts/common/Makefile.files
	usr/src/uts/common/dtrace/dtrace.c
	usr/src/uts/common/fs/zfs/arc.c
	usr/src/uts/common/fs/zfs/dmu.c
	usr/src/uts/common/fs/zfs/dsl_dataset.c
	usr/src/uts/common/fs/zfs/dsl_pool.c
	usr/src/uts/common/fs/zfs/sys/zio.h
	usr/src/uts/common/io/fibre-channel/fca/fcoei/fcoei_eth.c
	usr/src/uts/common/io/fibre-channel/fca/fcoei/fcoei_lv.c
	usr/src/uts/common/sys/dtrace.h

1 files changed, 0 insertions, 79 deletions

diff --git a/usr/src/lib/libldap4/common/extensions.c b/usr/src/lib/libldap4/common/extensions.c
deleted file mode 100644
index 247ad2baa5..0000000000
--- a/usr/src/lib/libldap4/common/extensions.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- *
- * Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- *
- * Comments:   
- *
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-#include <stdio.h>
-#include <string.h>
-
-#ifdef MACOS
-#include "macos.h"
-#endif /* MACOS */
-
-#if !defined( MACOS ) && !defined( DOS )
-#include <sys/types.h>
-#include <sys/socket.h>
-#endif
-
-#include "lber.h"
-#include "ldap.h"
-#include "ldap-private.h"
-#include "ldap-int.h"
-
-int ldap_create_page_control(LDAP *ld, unsigned int pagesize, struct berval *cookie, char isCritical, LDAPControl **output)
-{
-	BerElement *ber;
-	int rc;
-
-	if (NULL == ld || NULL == output)
-		return (LDAP_PARAM_ERROR);
-
-	if ((ber = ber_alloc_t(LBER_USE_DER)) == NULLBER){
-		return (LDAP_NO_MEMORY);
-	}
-	
-	if (ber_printf(ber, "{io}", pagesize,
-			(cookie && cookie->bv_val) ? cookie->bv_val : "",
-			(cookie && cookie->bv_val) ? cookie->bv_len : 0)
-				 == LBER_ERROR) {
-		ber_free(ber, 1);
-		return (LDAP_ENCODING_ERROR);
-	}
-
-	rc = ldap_build_control(LDAP_CONTROL_SIMPLE_PAGE, ber, 1, isCritical,
-		output);
-
-	ld->ld_errno = rc;
-	return (rc);
-}
-
-int ldap_parse_page_control(LDAP *ld, LDAPControl **controls, unsigned int *totalcount, struct berval **cookie)
-{
-	int i, rc;
-	BerElement *theBer;
-	LDAPControl *listCtrlp;
-	
-	for (i = 0; controls[i] != NULL; i++){
-		if (strcmp(controls[i]->ldctl_oid, "1.2.840.113556.1.4.319") == 0) {
-			listCtrlp = controls[i];
-			if ((theBer = ber_init(&listCtrlp->ldctl_value)) == NULLBER){
-				return (LDAP_NO_MEMORY);
-			}
-			if ((rc = ber_scanf(theBer, "{iO}", totalcount, cookie)) == LBER_ERROR){
-				ber_free(theBer, 1);
-				return (LDAP_DECODING_ERROR);
-			}
-			ber_free(theBer, 1);
-			return (LDAP_SUCCESS);
-		}
-	}
-	return (LDAP_CONTROL_NOT_FOUND);
-}
-