From 87e58fb031728cc0dfcf04f7f2df23fd0e7619d4 Mon Sep 17 00:00:00 2001
From: Stig Venaas <venaas@openldap.org>
Date: Thu, 2 Nov 2000 10:10:36 +0000
Subject: [PATCH] Changed ucdata loading, all is done in config.c. Tried to
 make ucdata load when found in config file, or before first call to
 dn_normalize/dn_validate

---
 servers/slapd/config.c      | 32 +++++++++++++++++++++++++-------
 servers/slapd/proto-slap.h  |  1 -
 servers/slapd/schema_prep.c |  3 ---
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index 7bf4e4f69b..4d82b2794d 100644
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -36,7 +36,6 @@ int		global_lastmod = ON;
 int		global_idletimeout = 0;
 char	*global_host = NULL;
 char	*global_realm = NULL;
-char	*global_ucdata_path = NULL;
 char		*ldap_srvtab = "";
 char		*default_passwd_hash;
 char		*default_search_base = NULL;
@@ -53,6 +52,7 @@ static void	fp_getline_init(int *lineno);
 static int	fp_parse_line(char *line, int *argcp, char **argv);
 
 static char	*strtok_quote(char *line, char *sep);
+static int      load_ucdata(char *path);
 
 int
 read_config( const char *fname )
@@ -208,6 +208,7 @@ read_config( const char *fname )
 			default_search_base = ch_strdup( cargv[1] );
 			default_search_nbase = ch_strdup( cargv[1] );
 
+			load_ucdata( NULL );
 			if( dn_normalize( default_search_nbase ) == NULL ) {
 				Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 					"invalid default search base \"%s\"\n",
@@ -357,14 +358,11 @@ read_config( const char *fname )
 				return( 1 );
 			}
 
-			if ( global_ucdata_path != NULL ) {
+			if ( load_ucdata( cargv[1] ) == 0 ) {
 				Debug( LDAP_DEBUG_ANY,
-					"%s: line %d: already set ucdata-path!\n",
-					fname, lineno, 0 );
+				       "%s: line %d: ucdata already loaded, ucdata-path must be set earlier in the file and/or be specified only once!\n",
+				       fname, lineno, 0 );
 				return 1;
-
-			} else {
-				global_ucdata_path = ch_strdup( cargv[1] );
 			}
 
 		/* set time limit */
@@ -422,6 +420,7 @@ read_config( const char *fname )
 				    fname, lineno, tmp_be->be_suffix[0] );
 			} else {
 				char *dn = ch_strdup( cargv[1] );
+				load_ucdata( NULL );
 				if( dn_validate( dn ) == NULL ) {
 					Debug( LDAP_DEBUG_ANY, "%s: line %d: "
 						"suffix DN invalid \"%s\"\n",
@@ -480,6 +479,7 @@ read_config( const char *fname )
 				char *alias, *aliased_dn;
 
 				alias = ch_strdup( cargv[1] );
+				load_ucdata( NULL );
 				(void) dn_normalize( alias );
 
 				aliased_dn = ch_strdup( cargv[2] );
@@ -531,6 +531,7 @@ read_config( const char *fname )
 				be->be_root_dn = ch_strdup( cargv[1] );
 				be->be_root_ndn = ch_strdup( cargv[1] );
 
+				load_ucdata( NULL );
 				if( dn_normalize( be->be_root_ndn ) == NULL ) {
 					free( be->be_root_dn );
 					free( be->be_root_ndn );
@@ -931,6 +932,7 @@ read_config( const char *fname )
 				    fname, lineno, 0 );
 			} else {
 				be->be_update_ndn = ch_strdup( cargv[1] );
+				load_ucdata( NULL );
 				if( dn_normalize( be->be_update_ndn ) == NULL ) {
 					Debug( LDAP_DEBUG_ANY,
 "%s: line %d: updatedn DN is invalid\n",
@@ -1160,6 +1162,7 @@ read_config( const char *fname )
 		free( saveline );
 	}
 	fclose( fp );
+	load_ucdata( NULL );
 	return( 0 );
 }
 
@@ -1291,3 +1294,18 @@ fp_getline_init( int *lineno )
 	*lineno = -1;
 	buf[0] = '\0';
 }
+
+/* Loads ucdata, returns 1 if loading, 0 if already loaded */
+static int
+load_ucdata( char *path )
+{
+	static int loaded = 0;
+
+	if ( loaded ) {
+		return 0;
+	}
+	ucdata_load( path ? path : SLAPD_DEFAULT_UCDATA,
+		     UCDATA_CASE|UCDATA_CTYPE|UCDATA_NUM );
+	loaded = 1;
+	return 1;
+}
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 56bc4c2372..9c48bf6889 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -811,7 +811,6 @@ LDAP_SLAPD_F (int)		global_idletimeout;
 LDAP_SLAPD_F (int)		global_schemacheck;
 LDAP_SLAPD_F (char)		*global_host;
 LDAP_SLAPD_F (char)		*global_realm;
-LDAP_SLAPD_F (char)		*global_ucdata_path;
 LDAP_SLAPD_F (char)		*default_passwd_hash;
 LDAP_SLAPD_F (int)		lber_debug;
 LDAP_SLAPD_F (int)		ldap_syslog;
diff --git a/servers/slapd/schema_prep.c b/servers/slapd/schema_prep.c
index b62d8b2168..ce6bbbd9e6 100644
--- a/servers/slapd/schema_prep.c
+++ b/servers/slapd/schema_prep.c
@@ -219,9 +219,6 @@ schema_prep( void )
 	/* we should only be called once after schema_init() was called */
 	assert( schema_init_done == 1 );
 
-	ucdata_load( global_ucdata_path ? global_ucdata_path :
-		SLAPD_DEFAULT_UCDATA, UCDATA_CASE|UCDATA_CTYPE|UCDATA_NUM );
-
 	for( i=0; oc_map[i].ssom_name; i++ ) {
 		ObjectClass ** ocp = (ObjectClass **)
 			&(((char *) &slap_schema)[oc_map[i].ssom_offset]);
-- 
2.39.5