--- servers/slapd/schemaparse.c	2000/06/13 17:57:30	1.12.8.5
+++ servers/slapd/schemaparse.c	2000/07/29 01:53:14	1.12.8.7
@@ -1,5 +1,5 @@
 /* schemaparse.c - routines to parse config file objectclass definitions */
-/* $OpenLDAP: pkg/ldap/servers/slapd/schemaparse.c,v 1.34 2000/06/07 03:17:30 kurt Exp $ */
+/* $OpenLDAP: pkg/ldap/servers/slapd/schemaparse.c,v 1.12.8.6 2000/07/04 17:58:56 kurt Exp $ */
 /*
  * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
@@ -78,7 +78,7 @@ find_oidm(char *oid)
 	OidMacro *om;
 
 	/* OID macros must start alpha */
-	if ( isdigit( *oid ) )	{
+	if ( OID_LEADCHAR( *oid ) )	{
 		return oid;
 	}
 
@@ -166,7 +166,7 @@ parse_oc(
     char	**argv
 )
 {
-	LDAP_OBJECT_CLASS *oc;
+	LDAPObjectClass *oc;
 	int		code;
 	const char	*err;
 	char		*oid = NULL;
@@ -178,7 +178,7 @@ parse_oc(
 		oc_usage();
 	}
 	if ( oc->oc_oid ) {
-		if ( !isdigit( oc->oc_oid[0] )) {
+		if ( !OID_LEADCHAR( oc->oc_oid[0] )) {
 			/* Expand OID macros */
 			oid = find_oidm( oc->oc_oid );
 			if ( !oid ) {
@@ -257,7 +257,7 @@ parse_at(
     char	**argv
 )
 {
-	LDAP_ATTRIBUTE_TYPE *at;
+	LDAPAttributeType *at;
 	int		code;
 	const char	*err;
 	char		*oid = NULL;
@@ -272,7 +272,7 @@ parse_at(
 	for (; argv[3]; argv++)
 	{
 		if (!strcasecmp(argv[3], "syntax") &&
-		    !isdigit(*argv[4]))
+		    !OID_LEADCHAR(*argv[4]))
 		{
 			int slen;
 			Syntax *syn;
@@ -295,7 +295,7 @@ parse_at(
 		at_usage();
 	}
 	if ( at->at_oid ) {
-		if ( !isdigit( at->at_oid[0] )) {
+		if ( !OID_LEADCHAR( at->at_oid[0] )) {
 			/* Expand OID macros */
 			oid = find_oidm( at->at_oid );
 			if ( !oid ) {
@@ -311,8 +311,7 @@ parse_at(
 		}
 	}
 	/* at->at_oid == NULL will be an error someday */
-	if (soid)
-	{
+	if (soid) {
 		ldap_memfree(at->at_syntax_oid);
 		at->at_syntax_oid = soid;
 	}