From 886d9b9f4fd9bfd72c2c9728f13b8db1ff2793b7 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins@redhat.com>
Date: Tue, 11 Aug 2009 14:37:44 -0600
Subject: Change default branding to 389 - remove lite code

The vendor, brand, and capbrand are set in configure - we should use those
everywhere rather than have to run some sort of script over the code to
change vendor, brand, version, etc.  I've added VENDOR, BRAND, CAPBRAND
to the default defines passed to the compiler, and changed the code to use
these defines.  And instead of the unintuitively named PRODUCTTEXT macro,
we should use the already defined PRODUCT_VERSION.
This allowed me to get rid of some code.  The version was from a generated
file called dirver.h which we don't need anymore, and we don't need the perl
script dirver.pl which generated it.
The vendor string was coming from the dirlite header file.  So I also used this
as an excuse to get rid of all references to dirlite once and for all (yay!).
For the places in plain text files which are not substituted, I just used the
generic name Dirsrv or Directory Server instead of having an explicit brand
and/or version in there.

Reviewed by: nkinder (Thanks!)
---
 ldap/servers/slapd/schema.c | 46 ---------------------------------------------
 1 file changed, 46 deletions(-)

(limited to 'ldap/servers/slapd/schema.c')

diff --git a/ldap/servers/slapd/schema.c b/ldap/servers/slapd/schema.c
index 3eb3ab82..98224df6 100644
--- a/ldap/servers/slapd/schema.c
+++ b/ldap/servers/slapd/schema.c
@@ -117,7 +117,6 @@ static int schema_check_name(char *name, PRBool isAttribute, char *errorbuf,
 		size_t errorbufsize );
 static int schema_check_oid(const char *name, const char *oid,
 		PRBool isAttribute, char *errorbuf, size_t errorbufsize);
-static int has_smart_referral( Slapi_Entry *e );
 static int isExtensibleObjectclass(const char *objectclass);
 static int strip_oc_options ( struct objclass *poc );
 static char *stripOption (char *attr);
@@ -458,13 +457,6 @@ slapi_entry_schema_check( Slapi_PBlock *pb, Slapi_Entry *e )
   char errtext[ BUFSIZ ];
   PRUint32 schema_flags = 0;
 
-  /* smart referrals are not allowed in Directory Lite */
-  if ( config_is_slapd_lite() ) {
-    if ( has_smart_referral(e) ) {
-      return 1;
-    }
-  }
-	  
   /*
    * say the schema checked out ok if we're not checking schema at
    * all, or if this is a replication update.
@@ -3840,44 +3832,6 @@ static void sizedbuffer_allocate(struct sizedbuffer *p, size_t sizeneeded)
 	}
 }
 
-/*
- * has_smart_referral: returns 1 if the entry contains a ref attribute,
- *                     or a referral objectclass.
- *
- *                     Returns 0 If not.
- */
-                       
-
-static int
-has_smart_referral( Slapi_Entry *e ) {
-  
-  Slapi_Attr *aoc;
-  char ebuf[BUFSIZ];
-
-  /* Look for the ref attribute */
-  if ( (aoc = attrlist_find( e->e_attrs, "ref" )) != NULL ) {
-	LDAPDebug ( LDAP_DEBUG_ANY, "Entry \"%s\" contains a ref attrbute. Smart referrals are disabled in Directory Lite.\n", escape_string(slapi_entry_get_dn_const(e), ebuf),0,0 );
-	return 1;
-  }
-  
-  /* Look for the referral objectclass */
-  if ( (aoc = attrlist_find( e->e_attrs, "objectclass" )) != NULL ) {
-    Slapi_Value target, *found;
-	slapi_value_init(&target);
-	slapi_value_set_string(&target,"referral");
-	found= slapi_valueset_find(aoc, &aoc->a_present_values, &target);
-	value_done(&target);
-	if(found!=NULL)
-	{
-		LDAPDebug ( LDAP_DEBUG_ANY, "Entry \"%s\" is a referral object class. Smart referrals are disabled in Directory Lite.\n", escape_string(slapi_entry_get_dn_const(e), ebuf),0,0 );
-		return 1;
-	}
-  }
-  
-  /* No smart referral here */
-  return 0;
-}
-
 /*
  * Check if the object class is extensible
  */
-- 
cgit