Merge remote-tracking branch 'origin/mdb.master'

[openldap] / servers / slapd / root_dse.c

diff --git a/servers/slapd/root_dse.c b/servers/slapd/root_dse.c
index 019a530af2b7519b35efef7e4e457ae6f8f3fe31..e8112e61705a2a1bdceee9636d4faff8aea48477 100644 (file)
--- a/servers/slapd/root_dse.c
+++ b/servers/slapd/root_dse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2012 The OpenLDAP Foundation.
+ * Copyright 1999-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,9 +35,7 @@ static struct berval  builtin_supportedFeatures[] = {
        BER_BVC(LDAP_FEATURE_ABSOLUTE_FILTERS),         /* (&) and (|) search filters */
        BER_BVC(LDAP_FEATURE_LANGUAGE_TAG_OPTIONS),     /* Language Tag Options */
        BER_BVC(LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS),   /* Language Range Options */
-#ifdef LDAP_DEVEL
        BER_BVC(LDAP_FEATURE_SUBORDINATE_SCOPE),        /* "children" search scope */
-#endif
        BER_BVNULL
 };
 static struct berval   *supportedFeatures;
@@ -401,7 +399,8 @@ int
 root_dse_read_file( const char *fname )
 {
        struct LDIFFP   *fp;
-       int rc = 0, lineno = 0, lmax = 0, ldifrc;
+       int rc = 0, lmax = 0, ldifrc;
+       unsigned long lineno = 0;
        char    *buf = NULL;
 
        if ( (fp = ldif_open( fname, "r" )) == NULL ) {
@@ -427,7 +426,7 @@ root_dse_read_file( const char *fname )
 
                if( e == NULL ) {
                        Debug( LDAP_DEBUG_ANY, "root_dse_read_file: "
-                               "could not parse entry (file=\"%s\" line=%d)\n",
+                               "could not parse entry (file=\"%s\" line=%lu)\n",
                                fname, lineno, 0 );
                        rc = LDAP_OTHER;
                        break;
@@ -437,7 +436,7 @@ root_dse_read_file( const char *fname )
                if( e->e_nname.bv_len ) {
                        Debug( LDAP_DEBUG_ANY,
                                "root_dse_read_file: invalid rootDSE "
-                               "- dn=\"%s\" (file=\"%s\" line=%d)\n",
+                               "- dn=\"%s\" (file=\"%s\" line=%lu)\n",
                                e->e_dn, fname, lineno );
                        entry_free( e );
                        rc = LDAP_OTHER;