#include <ac/string.h>
#include <ac/ctype.h>
+#include <ac/signal.h>
#include <ac/socket.h>
#include <ac/errno.h>
#include "ldap_pvt.h"
#include "slap.h"
-#define MAXARGS 500
+#define ARGS_STEP 512
/*
* defaults for various global variables
slap_mask_t global_requires = 0;
slap_ssf_set_t global_ssf_set;
char *replogfile;
+int global_gentlehup = 0;
int global_idletimeout = 0;
char *global_host = NULL;
char *global_realm = NULL;
char *ldap_srvtab = "";
char *default_passwd_hash = NULL;
+int cargc = 0, cargv_size = 0;
+char **cargv;
struct berval default_search_base = { 0, NULL };
struct berval default_search_nbase = { 0, NULL };
unsigned num_subordinates = 0;
char *slapd_pid_file = NULL;
char *slapd_args_file = NULL;
-int nSaslRegexp = 0;
-SaslRegexp_t *SaslRegexp = NULL;
+char *strtok_quote_ptr;
#ifdef SLAPD_RLOOKUPS
int use_reverse_lookup = 1;
static char *fp_getline(FILE *fp, int *lineno);
static void fp_getline_init(int *lineno);
-static int fp_parse_line(int lineno, char *line, int *argcp, char **argv);
+static int fp_parse_line(int lineno, char *line);
static char *strtok_quote(char *line, char *sep);
static int load_ucdata(char *path);
{
FILE *fp;
char *line, *savefname, *saveline;
- int cargc, savelineno;
- char *cargv[MAXARGS+1];
+ int savelineno;
int lineno, i;
int rc;
struct berval vals[2];
vals[1].bv_val = NULL;
+ cargv = ch_calloc( ARGS_STEP + 1, sizeof(*cargv) );
+ cargv_size = ARGS_STEP + 1;
+
if ( (fp = fopen( fname, "r" )) == NULL ) {
ldap_syslog = 1;
#ifdef NEW_LOGGING
/* fp_parse_line is destructive, we save a copy */
saveline = ch_strdup( line );
- if ( fp_parse_line( lineno, line, &cargc, cargv ) != 0 ) {
+ if ( fp_parse_line( lineno, line ) != 0 ) {
return( 1 );
}
lutil_salt_format( cargv[1] );
- /* set SASL host */
- } else if ( strcasecmp( cargv[0], "sasl-host" ) == 0 ) {
- if ( cargc < 2 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d: missing host in \"sasl-host <host>\" line\n",
- fname, lineno ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: missing host in \"sasl-host <host>\" line\n",
- fname, lineno, 0 );
-#endif
-
- return( 1 );
- }
-
- if ( global_host != NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d: already set sasl-host!\n",
- fname, lineno ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: already set sasl-host!\n",
- fname, lineno, 0 );
-#endif
-
+#ifdef HAVE_CYRUS_SASL
+ /* SASL config options */
+ } else if ( strncasecmp( cargv[0], "sasl", 4 ) == 0 ) {
+ if ( slap_sasl_config( cargc, cargv, line, fname, lineno ) )
return 1;
-
- } else {
- global_host = ch_strdup( cargv[1] );
- }
-
- /* set SASL realm */
- } else if ( strcasecmp( cargv[0], "sasl-realm" ) == 0 ) {
- if ( cargc < 2 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d: missing realm in \"sasl-realm <realm>\" line.\n",
- fname, lineno ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: missing realm in \"sasl-realm <realm>\" line\n",
- fname, lineno, 0 );
-#endif
-
- return( 1 );
- }
-
- if ( global_realm != NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d: already set sasl-realm!\n",
- fname, lineno ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: already set sasl-realm!\n",
- fname, lineno, 0 );
-#endif
-
- return 1;
-
- } else {
- global_realm = ch_strdup( cargv[1] );
- }
-
- } else if ( !strcasecmp( cargv[0], "sasl-regexp" )
- || !strcasecmp( cargv[0], "saslregexp" ) )
- {
- int rc;
- if ( cargc != 3 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d: need 2 args in "
- "\"saslregexp <match> <replace>\"\n",
- fname, lineno ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: need 2 args in \"saslregexp <match> <replace>\"\n",
- fname, lineno, 0 );
-#endif
-
- return( 1 );
- }
- rc = slap_sasl_regexp_config( cargv[1], cargv[2] );
- if ( rc ) {
- return rc;
- }
-
- /* SASL security properties */
- } else if ( strcasecmp( cargv[0], "sasl-secprops" ) == 0 ) {
- char *txt;
-
- if ( cargc < 2 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d: missing flags in "
- "\"sasl-secprops <properties>\" line\n",
- fname, lineno ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: missing flags in \"sasl-secprops <properties>\" line\n",
- fname, lineno, 0 );
-#endif
-
- return 1;
- }
-
- txt = slap_sasl_secprops( cargv[1] );
- if ( txt != NULL ) {
-#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "%s: line %d sas-secprops: %s\n",
- fname, lineno, txt ));
-#else
- Debug( LDAP_DEBUG_ANY,
- "%s: line %d: sasl-secprops: %s\n",
- fname, lineno, txt );
-#endif
-
- return 1;
- }
+#endif /* HAVE_CYRUS_SASL */
/* set UCDATA path */
} else if ( strcasecmp( cargv[0], "ucdata-path" ) == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO, "%s: line %d: "
"subordinate keyword must appear inside a database "
- "definition (ignored).\n", fname, lineno ));
+ "definition.\n", fname, lineno ));
#else
Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix line "
- "must appear inside a database definition (ignored)\n",
+ "must appear inside a database definition.\n",
fname, lineno, 0 );
#endif
+ return 1;
+
} else {
be->be_flags |= SLAP_BFLAG_GLUE_SUBORDINATE;
num_subordinates++;
/* set database suffix */
} else if ( strcasecmp( cargv[0], "suffix" ) == 0 ) {
Backend *tmp_be;
- struct berval dn;
- struct berval *pdn = NULL;
- struct berval *ndn = NULL;
+ struct berval dn, pdn, ndn;
if ( cargc < 2 ) {
#ifdef NEW_LOGGING
dn.bv_val = cargv[1];
dn.bv_len = strlen( cargv[1] );
- pdn = ch_malloc( sizeof( struct berval ));
- ndn = ch_malloc( sizeof( struct berval ));
- rc = dnPrettyNormal( NULL, &dn, pdn, ndn );
+ rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
return( 1 );
}
- tmp_be = select_backend( ndn, 0, 0 );
+ tmp_be = select_backend( &ndn, 0, 0 );
if ( tmp_be == be ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"already served by this backend (ignored)\n",
fname, lineno, 0 );
#endif
- ber_bvfree( pdn );
- ber_bvfree( ndn );
+ free( pdn.bv_val );
+ free( ndn.bv_val );
} else if ( tmp_be != NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: suffix already served by a preceding "
"backend \"%s\"\n", fname, lineno,
- tmp_be->be_suffix[0]->bv_val ));
+ tmp_be->be_suffix[0].bv_val ));
#else
Debug( LDAP_DEBUG_ANY, "%s: line %d: suffix "
"already served by a preceeding backend \"%s\"\n",
- fname, lineno, tmp_be->be_suffix[0]->bv_val );
+ fname, lineno, tmp_be->be_suffix[0].bv_val );
#endif
- ber_bvfree( pdn );
- ber_bvfree( ndn );
+ free( pdn.bv_val );
+ free( ndn.bv_val );
return( 1 );
- } else if( pdn->bv_len == 0 && default_search_nbase.bv_len ) {
+ } else if( pdn.bv_len == 0 && default_search_nbase.bv_len ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: suffix DN empty and default search "
#endif
}
- ber_bvecadd( &be->be_suffix, pdn );
- ber_bvecadd( &be->be_nsuffix, ndn );
+ ber_bvarray_add( &be->be_suffix, &pdn );
+ ber_bvarray_add( &be->be_nsuffix, &ndn );
/* set database suffixAlias */
} else if ( strcasecmp( cargv[0], "suffixAlias" ) == 0 ) {
Backend *tmp_be;
- struct berval alias, *palias, nalias;
- struct berval aliased, *paliased, naliased;
+ struct berval alias, palias, nalias;
+ struct berval aliased, paliased, naliased;
if ( cargc < 2 ) {
#ifdef NEW_LOGGING
"\"suffixAlias <alias> <aliased_dn>\" line\n",
fname, lineno, 0 );
#endif
-
return( 1 );
+
} else if ( cargc > 3 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
"%s: line %d: extra cruft in suffixAlias line (ignored)\n",
fname, lineno, 0 );
#endif
-
}
if ( be == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: suffixAlias line must appear inside a "
- "database definition (ignored).\n", fname, lineno ));
+ "database definition.\n", fname, lineno ));
#else
Debug( LDAP_DEBUG_ANY,
"%s: line %d: suffixAlias line"
- " must appear inside a database definition (ignored)\n",
+ " must appear inside a database definition.\n",
fname, lineno, 0 );
#endif
+ return 1;
}
if ( load_ucdata( NULL ) < 0 ) return 1;
alias.bv_val = cargv[1];
alias.bv_len = strlen( cargv[1] );
- palias = ch_malloc(sizeof(struct berval));
- rc = dnPrettyNormal( NULL, &alias, palias, &nalias );
+ rc = dnPrettyNormal( NULL, &alias, &palias, &nalias );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: suffixAlias served by a preceeding "
"backend \"%s\"\n",
- fname, lineno, tmp_be->be_suffix[0]->bv_val ));
+ fname, lineno, tmp_be->be_suffix[0].bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"%s: line %d: suffixAlias served by"
" a preceeding backend \"%s\"\n",
- fname, lineno, tmp_be->be_suffix[0]->bv_val );
+ fname, lineno, tmp_be->be_suffix[0].bv_val );
#endif
- ber_bvfree( palias );
+ free( palias.bv_val );
return -1;
}
aliased.bv_val = cargv[2];
aliased.bv_len = strlen( cargv[2] );
- paliased = ch_malloc(sizeof(struct berval));
- rc = dnPrettyNormal( NULL, &aliased, paliased, &naliased );
+ rc = dnPrettyNormal( NULL, &aliased, &paliased, &naliased );
if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
"%s: line %d: aliased DN is invalid\n",
fname, lineno, 0 );
#endif
- ber_bvfree( palias );
+ free( palias.bv_val );
return( 1 );
}
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: suffixAlias derefs to a different backend "
"a preceeding backend \"%s\"\n",
- fname, lineno, tmp_be->be_suffix[0]->bv_val ));
+ fname, lineno, tmp_be->be_suffix[0].bv_val ));
#else
Debug( LDAP_DEBUG_ANY,
"%s: line %d: suffixAlias derefs to differnet backend"
" a preceeding backend \"%s\"\n",
- fname, lineno, tmp_be->be_suffix[0]->bv_val );
+ fname, lineno, tmp_be->be_suffix[0].bv_val );
#endif
- ber_bvfree( palias );
- ber_bvfree( paliased );
+ free( palias.bv_val );
+ free( paliased.bv_val );
return -1;
}
- ber_bvecadd( &be->be_suffixAlias, palias );
- ber_bvecadd( &be->be_suffixAlias, paliased );
+ ber_bvarray_add( &be->be_suffixAlias, &palias );
+ ber_bvarray_add( &be->be_suffixAlias, &paliased );
/* set max deref depth */
} else if ( strcasecmp( cargv[0], "maxDerefDepth" ) == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: depth line must appear inside a database "
- "definition (ignored)\n", fname, lineno ));
+ "definition.\n", fname, lineno ));
#else
Debug( LDAP_DEBUG_ANY,
-"%s: line %d: depth line must appear inside a database definition (ignored)\n",
+"%s: line %d: depth line must appear inside a database definition.\n",
fname, lineno, 0 );
#endif
+ return 1;
} else if ((i = atoi(cargv[1])) < 0) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
- "%s: line %d: depth must be positive (ignored).\n",
+ "%s: line %d: depth must be positive.\n",
fname, lineno ));
#else
Debug( LDAP_DEBUG_ANY,
-"%s: line %d: depth must be positive (ignored)\n",
+"%s: line %d: depth must be positive.\n",
fname, lineno, 0 );
#endif
+ return 1;
} else {
return( 1 );
}
+
if ( be == NULL ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: rootdn line must appear inside a database "
- "definition (ignored).\n", fname, lineno ));
+ "definition.\n", fname, lineno ));
#else
Debug( LDAP_DEBUG_ANY,
-"%s: line %d: rootdn line must appear inside a database definition (ignored)\n",
+"%s: line %d: rootdn line must appear inside a database definition.\n",
fname, lineno, 0 );
#endif
+ return 1;
} else {
struct berval dn;
if ( cargc < 2 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
-
"%s: line %d: missing passwd in \"rootpw <passwd>\""
- " line\n", fname, lineno ));
+ "%s: line %d: missing passwd in \"rootpw <passwd>\""
+ " line\n", fname, lineno ));
#else
- Debug( LDAP_DEBUG_ANY,
-
"%s: line %d: missing passwd in \"rootpw <passwd>\" line\n",
+ Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+
"missing passwd in \"rootpw <passwd>\" line\n",
fname, lineno, 0 );
#endif
return( 1 );
}
+
if ( be == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_INFO,
- "%s: line %d: rootpw line must appear inside a database "
- "definition (ignored)\n", fname, lineno ));
+ LDAP_LOG(( "config", LDAP_LEVEL_INFO, "%s: line %d: "
+ "rootpw line must appear inside a database "
+ "definition.\n", fname, lineno ));
#else
- Debug( LDAP_DEBUG_ANY,
-"%s: line %d: rootpw line must appear inside a database definition (ignored)\n",
+ Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+ "rootpw line must appear inside a database "
+ "definition.\n",
fname, lineno, 0 );
#endif
+ return 1;
} else {
+ Backend *tmp_be = select_backend( &be->be_rootndn, 0, 0 );
+
+ if( tmp_be != be ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "config", LDAP_LEVEL_INFO,
+ "%s: line %d: "
+ "rootpw can only be set when rootdn is under suffix\n"
+ fname, lineno ));
+#else
+ Debug( LDAP_DEBUG_ANY, "%s: line %d: "
+ "rootpw can only be set when rootdn is under suffix\n",
+ fname, lineno, 0 );
+#endif
+ return 1;
+ }
+
be->be_rootpw.bv_val = ch_strdup( cargv[1] );
be->be_rootpw.bv_len = strlen( be->be_rootpw.bv_val );
}
} else if( strcasecmp( cargv[i], "bind_simple" ) == 0 ) {
disallows |= SLAP_DISALLOW_BIND_SIMPLE;
+ } else if( strcasecmp( cargv[i], "bind_simple_unprotected" ) == 0 ) {
+ disallows |= SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED;
+
} else if( strcasecmp( cargv[i], "bind_krbv4" ) == 0 ) {
disallows |= SLAP_DISALLOW_BIND_KRBV4;
"%s: line %d: old objectclass format not supported.\n",
fname, lineno, 0 );
#endif
-
}
/* specify an attribute type */
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: replica line must appear inside "
- "a database definition (ignored).\n", fname, lineno ));
+ "a database definition.\n", fname, lineno ));
#else
Debug( LDAP_DEBUG_ANY,
-"%s: line %d: replica line must appear inside a database definition (ignored)\n",
+"%s: line %d: replica line must appear inside a database definition\n",
fname, lineno, 0 );
#endif
+ return 1;
} else {
int nr = -1;
if ( i == cargc ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
- "%s: line %d: missing host in \"replica\" "
- "line (ignored)\n", fname, lineno ));
+ "%s: line %d: missing host in \"replica\" line\n",
+ fname, lineno ));
#else
Debug( LDAP_DEBUG_ANY,
- "%s: line %d: missing host in \"replica\" line (ignored)\n",
+ "%s: line %d: missing host in \"replica\" line\n",
fname, lineno, 0 );
#endif
+ return 1;
} else if ( nr == -1 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: unable to add"
- " replica \"%s\""
- " (ignored)\n",
+ " replica \"%s\"\n",
fname, lineno,
cargv[i] + 5 ));
#else
Debug( LDAP_DEBUG_ANY,
- "%s: line %d: unable to add replica \"%s\" (ignored)\n",
+ "%s: line %d: unable to add replica \"%s\"\n",
fname, lineno, cargv[i] + 5 );
#endif
+ return 1;
} else {
for ( i = 1; i < cargc; i++ ) {
if ( strncasecmp( cargv[i], "suffix=", 7 ) == 0 ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_INFO,
"%s: line %d: updatedn line must appear inside "
- "a database definition (ignored)\n",
+ "a database definition\n",
fname, lineno ));
#else
Debug( LDAP_DEBUG_ANY,
-"%s: line %d: updatedn line must appear inside a database definition (ignored)\n",
+"%s: line %d: updatedn line must appear inside a database definition\n",
fname, lineno, 0 );
#endif
+ return 1;
} else {
struct berval dn;
}
}
+#ifdef SIGHUP
+ /* turn on/off gentle SIGHUP handling */
+ } else if ( strcasecmp( cargv[0], "gentlehup" ) == 0 ) {
+ if ( cargc < 2 ) {
+ Debug( LDAP_DEBUG_ANY,
+ "%s: line %d: missing on|off in \"gentlehup <on|off>\" line\n",
+ fname, lineno, 0 );
+ return( 1 );
+ }
+ if ( strcasecmp( cargv[1], "off" ) == 0 ) {
+ global_gentlehup = 0;
+ } else {
+ global_gentlehup = 1;
+ }
+#endif
+
/* set idle timeout value */
} else if ( strcasecmp( cargv[0], "idletimeout" ) == 0 ) {
int i;
}
if (module_path( cargv[1] )) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "cofig", LDAP_LEVEL_CRIT,
+ LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
"%s: line %d: failed to set module search path to %s.\n",
fname, lineno, cargv[1] ));
#else
static int
fp_parse_line(
int lineno,
- char *line,
- int *argcp,
- char **argv
+ char *line
)
{
char * token;
char * logline;
+ char logbuf[sizeof("pseudorootpw ***")];
- *argcp = 0;
+ cargc = 0;
token = strtok_quote( line, " \t" );
- logline = (!token || strcasecmp(token, "rootpw") ? line : "rootpw *");
+ logline = line;
+ if ( token &&
+ (strcasecmp( token, "rootpw" ) == 0 ||
+ strcasecmp( token, "replica" ) == 0 || /* contains "credentials" */
+ strcasecmp( token, "bindpw" ) == 0 || /* used in back-ldap */
+ strcasecmp( token, "pseudorootpw" ) == 0 || /* used in back-meta */
+ strcasecmp( token, "dbpasswd" ) == 0 ) ) /* used in back-sql */
+ sprintf( logline = logbuf, "%s ***", token );
+ if ( strtok_quote_ptr )
+ *strtok_quote_ptr = ' ';
#ifdef NEW_LOGGING
LDAP_LOG(( "config", LDAP_LEVEL_DETAIL1,
"line %d (%s)\n", lineno, logline ));
#else
Debug( LDAP_DEBUG_CONFIG, "line %d (%s)\n", lineno, logline, 0 );
#endif
+ if ( strtok_quote_ptr )
+ *strtok_quote_ptr = '\0';
for ( ; token != NULL; token = strtok_quote( NULL, " \t" ) ) {
- if ( *argcp == MAXARGS ) {
+ if ( cargc == cargv_size - 1 ) {
+ char **tmp;
+ tmp = ch_realloc( cargv, (cargv_size + ARGS_STEP) *
+ sizeof(*cargv) );
+ if ( tmp == NULL ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "config", LDAP_LEVEL_CRIT,
- "fp_parse_line: too many tokens (%d max).\n",
- MAXARGS ));
+ LDAP_LOG(( "config", LDAP_LEVEL_ERR,
+ "line %d: out of memory\n",
+ lineno ));
#else
- Debug( LDAP_DEBUG_ANY, "Too many tokens (max %d)\n",
- MAXARGS, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "line %d: out of memory\n",
+ lineno, 0, 0 );
#endif
-
- return( 1 );
+ return -1;
+ }
+ cargv = tmp;
+ cargv_size += ARGS_STEP;
}
- argv[(*argcp)++] = token;
+ cargv[cargc++] = token;
}
- argv[*argcp] = NULL;
+ cargv[cargc] = NULL;
return 0;
}
char *tmp;
static char *next;
+ strtok_quote_ptr = NULL;
if ( line != NULL ) {
next = line;
}
default:
if ( ! inquote ) {
if ( strchr( sep, *next ) != NULL ) {
+ strtok_quote_ptr = next;
*next++ = '\0';
return( tmp );
}
projects / openldap / blobdiff