Make ConfigArgs.lineno int like elsewhere instead of unsigned long

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 97f2c8b8f305324214b1ff7479ef487fbdc91675..13091fcc675748790d1f1fdfa58fd5b3646945d5 100644 (file)
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -2279,7 +2279,7 @@ config_updateref(ConfigArgs *c) {
 
 static int
 config_include(ConfigArgs *c) {
-       unsigned long savelineno = c->lineno;
+       int savelineno = c->lineno;
        int rc;
        ConfigFile *cf;
        ConfigFile *cfsave = cfn;

diff --git a/servers/slapd/config.c b/servers/slapd/config.c
index fa3a2c2e2434bc246606f431922be992e89d095b..5bf7b3992eb66c5d7f477133c98712b4f99339ce 100644 (file)
--- a/servers/slapd/config.c
+++ b/servers/slapd/config.c
@@ -609,7 +609,7 @@ read_config_file(const char *fname, int depth, ConfigArgs *cf, ConfigTable *cft)
                        continue;
                }
 
-               snprintf( c->log, sizeof( c->log ), "%s: line %lu",
+               snprintf( c->log, sizeof( c->log ), "%s: line %d",
                                c->fname, c->lineno );
 
                c->argc = 0;
@@ -1117,7 +1117,7 @@ fp_parse_line(ConfigArgs *c)
 
        if(token) for(i = 0; hide[i]; i++) if(!strcasecmp(token, hide[i])) break;
        if(quote_ptr) *quote_ptr = ' ';
-       Debug(LDAP_DEBUG_CONFIG, "line %lu (%s%s)\n", c->lineno,
+       Debug(LDAP_DEBUG_CONFIG, "line %d (%s%s)\n", c->lineno,
                hide[i] ? hide[i] : c->line, hide[i] ? " ***" : "");
        if(quote_ptr) *quote_ptr = '\0';
 
@@ -1126,7 +1126,7 @@ fp_parse_line(ConfigArgs *c)
                        char **tmp;
                        tmp = ch_realloc(c->argv, (c->argv_size + ARGS_STEP) * sizeof(*c->argv));
                        if(!tmp) {
-                               Debug(LDAP_DEBUG_ANY, "line %lu: out of memory\n", c->lineno, 0, 0);
+                               Debug(LDAP_DEBUG_ANY, "line %d: out of memory\n", c->lineno, 0, 0);
                                return -1;
                        }
                        c->argv = tmp;

diff --git a/servers/slapd/config.h b/servers/slapd/config.h
index 6b14c07aa0c08c942316067b5bb9b1effb925ae7..3dc25928031df9e67f4e24142fecf50b8fcee7fb 100644 (file)
--- a/servers/slapd/config.h
+++ b/servers/slapd/config.h
@@ -109,7 +109,7 @@ typedef struct config_args_s {
        char *line;
        char *tline;
        const char *fname;
-       unsigned long lineno;
+       int lineno;
        char log[MAXPATHLEN + STRLENOF(": line 18446744073709551615") + 1];
        char msg[SLAP_TEXT_BUFLEN];
        int depth;