Resolves: bug 248145

Bug Description: Replace ds_newinst binary with perl script - remove dead code
Reviewed by: nhosoi (Thanks!)
Fix Description: This is my favorite part - removing all of the now dead code.  I also had to fix the exit code so that you could use $? to test for the success or failure of the new setup scripts.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: no

1 files changed, 0 insertions, 251 deletions

diff --git a/ldap/admin/lib/dsalib_conf.c b/ldap/admin/lib/dsalib_conf.c
deleted file mode 100644
index 19161c59..00000000
--- a/ldap/admin/lib/dsalib_conf.c
+++ /dev/null
@@ -1,251 +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
-
-#if defined( XP_WIN32 )
-#include <windows.h>
-#include <process.h>
-#endif
-#include <sys/types.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "dsalib.h"
-#include <ldaplog.h>
-#include "portable.h"
-#include <ctype.h>
-
-#include "nspr.h"
-
-#define CONF_SUFFIX "cn=config"
-
-DS_EXPORT_SYMBOL char *
-ds_get_var_name(int varnum)
-{
-    if ( (varnum >= DS_CFG_MAX) || (varnum < 0) )
-        return(NULL);                      /* failure */
-    return(ds_cfg_info[varnum].dci_varname);
-}
-
-/*
- * Get config info.
- */
-DS_EXPORT_SYMBOL char **
-ds_get_config(int type)
-{
-    char        conffile[PATH_MAX];
-    char        *configdir;
-    FILE        *sf = NULL;
-    char        **conf_list = NULL;
-
-    if ( (type != DS_REAL_CONFIG) && (type != DS_TMP_CONFIG) ) {
-        ds_send_error("Invalid config file type.", 0);
-        return(NULL);
-    }
-
-    if ( (configdir = ds_get_config_dir()) == NULL ) {
-        ds_send_error("Cannot find configuration directory.", 0);
-        return(NULL);
-    }
-
-    PR_snprintf(conffile, PATH_MAX, "%s/%s", configdir, DS_CONFIG_FILE);
-
-    if ( !(sf = fopen(conffile, "r")) )  {
-        ds_send_error("could not read config file.", 1);
-        return(NULL);
-    }
-
-    conf_list = ds_get_conf_from_file(sf);
-
-    fclose(sf);
-    if (!conf_list) {
-        ds_send_error("failed to read the config file successfully.", 0);
-        return(NULL);
-    }
-    return(conf_list);
-}
-
-/*
- * NOTE: the ordering of the following array elements must be kept in sync
- * with the ordering of the #defines in ../include/dsalib.h.
- */
-struct ds_cfg_info ds_cfg_info[] = {
-{"nsslapd-errorlog-level" },
-{"nsslapd-referral" },
-{"nsslapd-auditlog" },
-{"nsslapd-localhost" },
-{"nsslapd-port" },
-{"nsslapd-security" },
-{"nsslapd-secureport" },
-{"nsslapd-ssl3ciphers"},
-{"passwordstoragescheme"},
-{"nsslapd-accesslog"},
-{"nsslapd-errorlog"},
-{"nsslapd-rootdn"},
-{"nsslapd-rootpwstoragescheme"},
-{"nsslapd-suffix"},
-{"nsslapd-localuser"},
-{0}
-};
-
-/*
- * Open the config file and look for option "option".  Return its
- * value, or NULL if the option was not found.
- */
-DS_EXPORT_SYMBOL char *
-ds_get_config_value( int option )
-{
-    char **all, *value;
-    int i;
-    char *attr = ds_get_var_name(option);
-
-    if (attr == NULL)
-	return NULL;
-
-    all = ds_get_config( DS_REAL_CONFIG );
-    if ( all == NULL ) {
-	return NULL;
-    }
-    for ( i = 0; all[ i ] != NULL; i++ ) {
-	if (( value = strchr( all[ i ], ':' )) != NULL ) {
-	    *value = '\0';
-	    ++value;
-	    while (*value && isspace(*value))
-		++value;
-	}
-	if ( !strcasecmp( attr, all[ i ] )) {
-	    return strdup( value );
-	}
-    }
-    return NULL;
-}
-
-static size_t
-count_quotes (const char* s)
-{
-    size_t count = 0;
-    const char* t = s;
-    if (t) while ((t = strpbrk (t, "\"\\")) != NULL) {
-	++count;
-	++t;
-    }
-    return count;
-}
-
-DS_EXPORT_SYMBOL char*
-ds_enquote_config_value (int paramnum, char* s)
-{
-    char* result;
-    char* brkcharset = "\"\\ \t\r\n";
-	char *encoded_quote = "22"; /* replace quote with \22 */
-	int encoded_quote_len = strlen(encoded_quote);
-	char *begin = s;
-    if (*s && ! strpbrk (s, brkcharset) && 
-		! (paramnum == DS_AUDITFILE || paramnum == DS_ACCESSLOG ||
-#if defined( XP_WIN32 )
-		   paramnum == DS_SUFFIX ||
-#endif
-		   paramnum == DS_ERRORLOG)) {
-		result = s;
-    } else {
-		char* t = malloc (strlen (s) + count_quotes (s) + 3);
-		result = t;
-		*t++ = '"';
-		while (*s) {
-			switch (*s) {
-
-			case '"':
-				/* convert escaped quotes by replacing the quote with
-				   escape code e.g. 22 so that \" is converted to \22 "*/
-				if ((s > begin) && (*(s - 1) == '\\'))
-				{
-					strcpy(t, encoded_quote);
-					t += encoded_quote_len;
-				}
-				else /* unescaped ", just replace with \22 "*/
-				{
-					*t++ = '\\';
-					strcpy(t, encoded_quote);
-					t += encoded_quote_len;					
-				}
-				++s;
-				break;
-
-			default: 
-				*t++ = *s++; /* just copy it */
-				break;
-			}
-		}
-		*t++ = '"';
-		*t = '\0';
-    }
-    return result;
-}
-
-DS_EXPORT_SYMBOL char*
-ds_DNS_to_DN (char* DNS)
-{
-    static const char* const RDN = "dc=";
-    char* DN;
-    char* dot;
-    size_t components;
-    if (DNS == NULL || *DNS == '\0') {
-	return strdup ("");
-    }
-    components = 1;
-    for (dot = strchr (DNS, '.'); dot != NULL; dot = strchr (dot + 1, '.')) {
-	++components;
-    }
-    DN = malloc (strlen (DNS) + (components * strlen(RDN)) + 1);
-    strcpy (DN, RDN);
-    for (dot = strchr (DNS, '.'); dot != NULL; dot = strchr (dot + 1, '.')) {
-	*dot = '\0';
-	strcat (DN, DNS);
-	strcat (DN, ",");
-	strcat (DN, RDN);
-	DNS = dot + 1;
-	*dot = '.';
-    }
-    strcat (DN, DNS);
-    dn_normalize (DN);
-    return DN;
-}