X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschemaparse.c;h=6f00e93eef2fa297d1cbfed1887fd8d11004caca;hb=517fa54bb0f764968ca56e7931a09adac4f33af6;hp=8350b877b7205be398de90cff19095a8190e1d68;hpb=6ad1c45bd3a69a398b144b92fbcf9d6653f02607;p=openldap diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c index 8350b877b7..6f00e93eef 100644 --- a/servers/slapd/schemaparse.c +++ b/servers/slapd/schemaparse.c @@ -78,7 +78,7 @@ find_oidm(char *oid) OidMacro *om; /* OID macros must start alpha */ - if ( isdigit( *oid ) ) { + if ( OID_LEADCHAR( *oid ) ) { return oid; } @@ -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 ) { @@ -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; }