apply naming scheme to global/database schema

[openldap] / servers / slapd / back-ldif / ldif.c

diff --git a/servers/slapd/back-ldif/ldif.c b/servers/slapd/back-ldif/ldif.c
index 5fe6a0b3b9f4d985a8c7f4627a22e9deff0303df..9467d96288d00ec412e4e33619115c0ad3c93922 100644 (file)
--- a/servers/slapd/back-ldif/ldif.c
+++ b/servers/slapd/back-ldif/ldif.c
@@ -60,7 +60,7 @@ static ConfigTable ldifcfg[] = {
                ldif_cf, NULL, NULL, NULL },
        { "directory", "dir", 2, 2, 0, ARG_BERVAL|ARG_OFFSET,
                (void *)offsetof(struct ldif_info, li_base_path),
-               "( OLcfgAt:1.1 NAME 'dbDirectory' "
+               "( OLcfgDbAt:0.1 NAME 'olcDbDirectory' "
                        "DESC 'Directory for database content' "
                        "EQUALITY caseIgnoreMatch "
                        "SYNTAX OMsDirectoryString )", NULL, NULL },
@@ -69,11 +69,11 @@ static ConfigTable ldifcfg[] = {
 };
 
 static ConfigOCs ldifocs[] = {
-       { "( OLcfgOc:2.1 "
-               "NAME 'ldifConfig' "
+       { "( OLcfgDbOc:2.1 "
+               "NAME 'olcLdifConfig' "
                "DESC 'LDIF backend configuration' "
                "SUP olcDatabaseConfig "
-               "MUST ( dbDirectory ) )", Cft_Database,
+               "MUST ( olcDbDirectory ) )", Cft_Database,
                &ldif_oc },
        { NULL, 0, NULL }
 };
@@ -579,8 +579,7 @@ ldif_back_referrals( Operation *op, SlapReply *rs )
                struct berval   pndn = op->o_req_ndn;
 
                for ( ; entry == NULL; ) {
-                       struct berval   opndn = pndn;
-                       dnParent( &opndn, &pndn );
+                       dnParent( &pndn, &pndn );
                        
                        if ( !dnIsSuffix( &pndn, &op->o_bd->be_nsuffix[0] ) ) {
                                break;