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, 106 deletions

diff --git a/usr/src/lib/libldap4/common/free.c b/usr/src/lib/libldap4/common/free.c
deleted file mode 100644
index a9d4bd0675..0000000000
--- a/usr/src/lib/libldap4/common/free.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- *
- * Portions Copyright 1999 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- *
- */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
-/*
- *  Copyright (c) 1994 The Regents of the University of Michigan.
- *  All rights reserved.
- *
- *  free.c - some free routines are included here to avoid having to
- *           link in lots of extra code when not using certain features
- */
-
-#ifndef lint 
-static char copyright[] = "@(#) Copyright (c) 1994 The Regents of the University of Michigan.\nAll rights reserved.\n";
-#endif
-
-
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#ifdef MACOS
-#include <stdlib.h>
-#include "macos.h"
-#else /* MACOS */
-#ifdef DOS
-#include <malloc.h>
-#include "msdos.h"
-#else /* DOS */
-#include <sys/types.h>
-#include <stdlib.h>
-#endif /* DOS */
-#endif /* MACOS */
-
-#include "lber.h"
-#include "ldap.h"
-#include "ldap-private.h"
-
-void
-ldap_getfilter_free( LDAPFiltDesc *lfdp )
-{
-    LDAPFiltList	*flp, *nextflp;
-    LDAPFiltInfo	*fip, *nextfip;
-
-    for ( flp = lfdp->lfd_filtlist; flp != NULL; flp = nextflp ) {
-	for ( fip = flp->lfl_ilist; fip != NULL; fip = nextfip ) {
-	    nextfip = fip->lfi_next;
-	    free( fip->lfi_filter );
-	    free( fip->lfi_desc );
-	    free( fip );
-	}
-	nextflp = flp->lfl_next;
-	free( flp->lfl_pattern );
-	free( flp->lfl_delims );
-	free( flp->lfl_tag );
-	free( flp );
-    }
-
-    if ( lfdp->lfd_curvalcopy != NULL ) {
-	free( lfdp->lfd_curvalcopy );
-    }
-    if ( lfdp->lfd_curvalwords != NULL ) {
-	free( lfdp->lfd_curvalwords );
-    }
-    if ( lfdp->lfd_filtprefix != NULL ) {
-	free( lfdp->lfd_filtprefix );
-    }
-    if ( lfdp->lfd_filtsuffix != NULL ) {
-	free( lfdp->lfd_filtsuffix );
-    }
-
-    free( lfdp );
-}
-
-/*
- * free a null-terminated array of pointers to mod structures. the
- * structures are freed, not the array itself, unless the freemods
- * flag is set.
- */
-
-void
-ldap_mods_free( LDAPMod **mods, int freemods )
-{
-	int	i;
-
-	if ( mods == NULL )
-		return;
-
-	for ( i = 0; mods[i] != NULL; i++ ) {
-		if ( mods[i]->mod_op & LDAP_MOD_BVALUES ) {
-			ber_bvecfree( mods[i]->mod_bvalues );
-		} else {
-			ldap_value_free( mods[i]->mod_values );
-		}
-		if (mods[i]->mod_type)
-			free(mods[i]->mod_type);
-		free( (char *) mods[i] );
-	}
-
-	if ( freemods )
-		free( (char *) mods );
-}