Resolves: #243488

Summary: Use mozldap6 ldif_parse_line API
Changes:
1) Removed ldif.h from the DS tree.
2) Eliminated the 5-th arg of ldif_parse_line (errmsg) and the errmsg related
code.

1 files changed, 0 insertions, 113 deletions

diff --git a/ldap/include/ldif.h b/ldap/include/ldif.h
deleted file mode 100644
index c6de212c..00000000
--- a/ldap/include/ldif.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/** BEGIN COPYRIGHT BLOCK
- * This Program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; version 2 of the License.
- * 
- * This Program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this Program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA.
- * 
- * In addition, as a special exception, Red Hat, Inc. gives You the additional
- * right to link the code of this Program with code not covered under the GNU
- * General Public License ("Non-GPL Code") and to distribute linked combinations
- * including the two, subject to the limitations in this paragraph. Non-GPL Code
- * permitted under this exception must only link to the code of this Program
- * through those well defined interfaces identified in the file named EXCEPTION
- * found in the source code files (the "Approved Interfaces"). The files of
- * Non-GPL Code may instantiate templates or use macros or inline functions from
- * the Approved Interfaces without causing the resulting work to be covered by
- * the GNU General Public License. Only Red Hat, Inc. may make changes or
- * additions to the list of Approved Interfaces. You must obey the GNU General
- * Public License in all respects for all of the Program code and other code used
- * in conjunction with the Program except the Non-GPL Code covered by this
- * exception. If you modify this file, you may extend this exception to your
- * version of the file, but you are not obligated to do so. If you do not wish to
- * provide this exception without modification, you must delete this exception
- * statement from your version and license this file solely under the GPL without
- * exception. 
- * 
- * 
- * Copyright (C) 2001 Sun Microsystems, Inc. Used by permission.
- * Copyright (C) 2005 Red Hat, Inc.
- * All rights reserved.
- * END COPYRIGHT BLOCK **/
-
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
-/*
- * Copyright (c) 1996 Regents of the University of Michigan.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms are permitted
- * provided that this notice is preserved and that due credit is given
- * to the University of Michigan at Ann Arbor. The name of the University
- * may not be used to endorse or promote products derived from this
- * software without specific prior written permission. This software
- * is provided ``as is'' without express or implied warranty.
- */
-
-#ifndef _LDIF_H
-#define _LDIF_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LDIF_VERSION_ONE        1	/* LDIF standard version */
-
-#define LDIF_MAX_LINE_WIDTH      76      /* maximum length of LDIF lines */
-
-/*
- * Macro to calculate maximum number of bytes that the base64 equivalent
- * of an item that is "vlen" bytes long will take up.  Base64 encoding
- * uses one byte for every six bits in the value plus up to two pad bytes.
- */
-#define LDIF_BASE64_LEN(vlen)	(((vlen) * 4 / 3 ) + 3)
-
-/*
- * Macro to calculate maximum size that an LDIF-encoded type (length
- * tlen) and value (length vlen) will take up:  room for type + ":: " +
- * first newline + base64 value + continued lines.  Each continued line
- * needs room for a newline and a leading space character.
- */
-#define LDIF_SIZE_NEEDED(tlen,vlen) \
-    ((tlen) + 4 + LDIF_BASE64_LEN(vlen) \
-    + ((LDIF_BASE64_LEN(vlen) + tlen + 3) / LDIF_MAX_LINE_WIDTH * 2 ))
-
-/*
- * Options for ldif_put_type_and_value_with_options() and 
- * ldif_type_and_value_with_options().
- */
-#define LDIF_OPT_NOWRAP			0x01UL
-#define LDIF_OPT_VALUE_IS_URL		0x02UL
-#define LDIF_OPT_MINIMAL_ENCODING	0x04UL
-
-int ldif_parse_line( char *line, char **type, char **value, int *vlen, char **errcode);
-char * ldif_getline( char **next );
-void ldif_put_type_and_value( char **out, char *t, char *val, int vlen );
-void ldif_put_type_and_value_nowrap( char **out, char *t, char *val, int vlen );
-void ldif_put_type_and_value_with_options( char **out, char *t, char *val,
-	int vlen, unsigned long options );
-char *ldif_type_and_value( char *type, char *val, int vlen );
-char *ldif_type_and_value_nowrap( char *type, char *val, int vlen );
-char *ldif_type_and_value_with_options( char *type, char *val, int vlen,
-	unsigned long options );
-int ldif_base64_decode( char *src, unsigned char *dst );
-int ldif_base64_encode( unsigned char *src, char *dst, int srclen,
-	int lenused );
-int ldif_base64_encode_nowrap( unsigned char *src, char *dst, int srclen,
-	int lenused );
-char *ldif_get_entry( FILE *fp, int *lineno );
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _LDIF_H */