mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-03-07 14:18:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

wrong length in statement selection (not critical); some cleanup (sizeof()-1 instead of strlen on constant strings)

Browse Source
This commit is contained in:
Pierangelo Masarati 2001-11-01 18:57:21 +00:00
parent 556f74c534
commit 3a16335374
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
servers/slurpd/config.c
View File

@ -369,8 +369,8 @@ parse_replica_line(
char *hp, *val; char *hp, *val;
for ( i = 1; i < cargc; i++ ) { for ( i = 1; i < cargc; i++ ) {
if ( !strncasecmp( cargv[ i ], HOSTSTR, strlen( HOSTSTR ))) { if ( !strncasecmp( cargv[ i ], HOSTSTR, sizeof( HOSTSTR ) - 1 ) ) {
val = cargv[ i ] + strlen( HOSTSTR ) + 1; val = cargv[ i ] + sizeof( HOSTSTR ); /* '\0' string terminator accounts for '=' */
if (( hp = strchr( val, ':' )) != NULL ) { if (( hp = strchr( val, ':' )) != NULL ) {
*hp = '\0'; *hp = '\0';
hp++; hp++;
@ -381,23 +381,24 @@ parse_replica_line(
} }
ri->ri_hostname = strdup( val ); ri->ri_hostname = strdup( val );
gots |= GOT_HOST; gots |= GOT_HOST;
} else if ( !strncasecmp( cargv[ i ], SUFFIXSTR, strlen( HOSTSTR ))) { } else if ( !strncasecmp( cargv[ i ],
SUFFIXSTR, sizeof( SUFFIXSTR ) - 1 ) ) {
/* ignore it */ ; /* ignore it */ ;
} else if ( !strncasecmp( cargv[ i ], TLSSTR, strlen( TLSSTR ))) { } else if ( !strncasecmp( cargv[ i ], TLSSTR, sizeof( TLSSTR ) - 1 ) ) {
val = cargv[ i ] + strlen( TLSSTR ) + 1; val = cargv[ i ] + sizeof( TLSSTR );
if( !strcasecmp( val, TLSCRITICALSTR ) ) { if( !strcasecmp( val, TLSCRITICALSTR ) ) {
ri->ri_tls = TLS_CRITICAL; ri->ri_tls = TLS_CRITICAL;
} else { } else {
ri->ri_tls = TLS_ON; ri->ri_tls = TLS_ON;
} }
} else if ( !strncasecmp( cargv[ i ], } else if ( !strncasecmp( cargv[ i ],
BINDDNSTR, strlen( BINDDNSTR ))) { BINDDNSTR, sizeof( BINDDNSTR ) - 1 ) ) {
val = cargv[ i ] + strlen( BINDDNSTR ) + 1; val = cargv[ i ] + sizeof( BINDDNSTR );
ri->ri_bind_dn = strdup( val ); ri->ri_bind_dn = strdup( val );
gots |= GOT_DN; gots |= GOT_DN;
} else if ( !strncasecmp( cargv[ i ], BINDMETHSTR, } else if ( !strncasecmp( cargv[ i ], BINDMETHSTR,
strlen( BINDMETHSTR ))) { sizeof( BINDMETHSTR ) - 1 ) ) {
val = cargv[ i ] + strlen( BINDMETHSTR ) + 1; val = cargv[ i ] + sizeof( BINDMETHSTR );
if ( !strcasecmp( val, KERBEROSSTR )) { if ( !strcasecmp( val, KERBEROSSTR )) {
fprintf( stderr, "Error: a bind method of \"kerberos\" was\n" ); fprintf( stderr, "Error: a bind method of \"kerberos\" was\n" );
fprintf( stderr, "specified in the slapd configuration file.\n" ); fprintf( stderr, "specified in the slapd configuration file.\n" );
@ -412,31 +413,39 @@ parse_replica_line(
} else { } else {
ri->ri_bind_method = -1; ri->ri_bind_method = -1;
} }
} else if ( !strncasecmp( cargv[ i ], SASLMECHSTR, strlen( SASLMECHSTR ))) { } else if ( !strncasecmp( cargv[ i ],
val = cargv[ i ] + strlen( SASLMECHSTR ) + 1; SASLMECHSTR, sizeof( SASLMECHSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( SASLMECHSTR );
gots |= GOT_MECH; gots |= GOT_MECH;
ri->ri_saslmech = strdup( val ); ri->ri_saslmech = strdup( val );
} else if ( !strncasecmp( cargv[ i ], CREDSTR, strlen( CREDSTR ))) { } else if ( !strncasecmp( cargv[ i ],
val = cargv[ i ] + strlen( CREDSTR ) + 1; CREDSTR, sizeof( CREDSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( CREDSTR );
ri->ri_password = strdup( val ); ri->ri_password = strdup( val );
} else if ( !strncasecmp( cargv[ i ], SECPROPSSTR, strlen( SECPROPSSTR ))) { } else if ( !strncasecmp( cargv[ i ],
val = cargv[ i ] + strlen( SECPROPSSTR ) + 1; SECPROPSSTR, sizeof( SECPROPSSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( SECPROPSSTR );
ri->ri_secprops = strdup( val ); ri->ri_secprops = strdup( val );
} else if ( !strncasecmp( cargv[ i ], REALMSTR, strlen( REALMSTR ))) { } else if ( !strncasecmp( cargv[ i ],
val = cargv[ i ] + strlen( REALMSTR ) + 1; REALMSTR, sizeof( REALMSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( REALMSTR );
ri->ri_realm = strdup( val ); ri->ri_realm = strdup( val );
} else if ( !strncasecmp( cargv[ i ], AUTHCSTR, strlen( AUTHCSTR ))) { } else if ( !strncasecmp( cargv[ i ],
val = cargv[ i ] + strlen( AUTHCSTR ) + 1; AUTHCSTR, sizeof( AUTHCSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( AUTHCSTR );
ri->ri_authcId = strdup( val ); ri->ri_authcId = strdup( val );
} else if ( !strncasecmp( cargv[ i ], OLDAUTHCSTR, strlen( OLDAUTHCSTR ))) { } else if ( !strncasecmp( cargv[ i ],
OLDAUTHCSTR, sizeof( OLDAUTHCSTR ) - 1 ) ) {
/* Old authcID is provided for some backwards compatibility */ /* Old authcID is provided for some backwards compatibility */
val = cargv[ i ] + strlen( OLDAUTHCSTR ) + 1; val = cargv[ i ] + sizeof( OLDAUTHCSTR );
ri->ri_authcId = strdup( val ); ri->ri_authcId = strdup( val );
} else if ( !strncasecmp( cargv[ i ], AUTHZSTR, strlen( AUTHZSTR ))) { } else if ( !strncasecmp( cargv[ i ],
val = cargv[ i ] + strlen( AUTHZSTR ) + 1; AUTHZSTR, sizeof( AUTHZSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( AUTHZSTR );
ri->ri_authzId = strdup( val ); ri->ri_authzId = strdup( val );
} else if ( !strncasecmp( cargv[ i ], SRVTABSTR, strlen( SRVTABSTR ))) { } else if ( !strncasecmp( cargv[ i ],
val = cargv[ i ] + strlen( SRVTABSTR ) + 1; SRVTABSTR, sizeof( SRVTABSTR ) - 1 ) ) {
val = cargv[ i ] + sizeof( SRVTABSTR );
if ( ri->ri_srvtab != NULL ) { if ( ri->ri_srvtab != NULL ) {
free( ri->ri_srvtab ); free( ri->ri_srvtab );
} }