upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-05 14:42:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

s/NULLMSG/NULL/

Browse source 
Fix ldappasswd timeval.
This commit is contained in:
Kurt Zeilenga 1999-05-19 07:14:27 +00:00
parent 1db064b821
commit 34c538fa0f
6 changed files with 26 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
clients/fax500/main.c
View file

@ -439,7 +439,7 @@ do_address(
/* no matches - bounce with user unknown */
if ( match == 0 ) {
add_error( err, nerr, E_USERUNKNOWN, name, NULLMSG );
add_error( err, nerr, E_USERUNKNOWN, name, NULL );
return;
}
@ -775,7 +775,7 @@ do_group_members(
add_error( err, nerr,
E_JOINMEMBERNOFAXNUM, ndn,
NULLMSG );
NULL );
free( ndn );
}
@ -793,7 +793,7 @@ do_group_members(
add_error( err, nerr,
E_JOINMEMBERNOEMAIL, ndn,
NULLMSG );
NULL );
free( ndn );
}
@ -835,7 +835,7 @@ add_member(
if ( (rc = ldap_search_st( ld, dn, LDAP_SCOPE_BASE, "(objectclass=*)",
attrs, 0, &timeout, &res )) != LDAP_SUCCESS ) {
if ( rc == LDAP_NO_SUCH_OBJECT ) {
add_error( err, nerr, E_BADMEMBER, dn, NULLMSG );
add_error( err, nerr, E_BADMEMBER, dn, NULL );
return;
} else {
@ -885,7 +885,7 @@ add_member(
ldap_value_free( mail );
ldap_msgfree( res );
} else {
add_error( err, nerr, E_MEMBERNOFAXNUM, ndn, NULLMSG );
add_error( err, nerr, E_MEMBERNOFAXNUM, ndn, NULL );
}
break;
case MAIL500 :
@ -897,7 +897,7 @@ add_member(
/* else generate a bounce */
} else {
add_error( err, nerr, E_MEMBERNOEMAIL, ndn, NULLMSG );
add_error( err, nerr, E_MEMBERNOEMAIL, ndn, NULL );
}
free( ndn );
@ -923,7 +923,7 @@ do_group_request(
ldap_value_free( requeststo );
} else {
add_error( err, nerr, E_NOREQUEST, dn, NULLMSG );
add_error( err, nerr, E_NOREQUEST, dn, NULL );
}
}
@ -945,7 +945,7 @@ do_group_errors(
ldap_value_free( errorsto );
} else {
add_error( err, nerr, E_NOERRORS, dn, NULLMSG );
add_error( err, nerr, E_NOERRORS, dn, NULL );
}
}

2
clients/gopher/go500.c
View file

@ -367,7 +367,7 @@ do_queries( int s )
if ( debug ) {
fprintf( stderr, "got %d bytes\n", len );
#ifdef LDAP_DEBUG
lber_bprint( buf, len );
ber_bprint( buf, len );
#endif
}

2
clients/gopher/go500gw.c
View file

@ -396,7 +396,7 @@ do_queries( int s )
if ( debug ) {
fprintf( stderr, "got %d bytes\n", len );
#ifdef LDAP_DEBUG
lber_bprint( buf, len );
ber_bprint( buf, len );
#endif
}

20
clients/mail500/main.c
View file

@ -514,9 +514,9 @@ do_address(
/* no matches - bounce with user unknown */
if ( match == 0 ) {
if ( type == USER ) {
add_error( err, nerr, E_USERUNKNOWN, name, NULLMSG );
add_error( err, nerr, E_USERUNKNOWN, name, NULL );
} else {
add_error( err, nerr, E_GROUPUNKNOWN, name, NULLMSG );
add_error( err, nerr, E_GROUPUNKNOWN, name, NULL );
}
return;
}
@ -836,7 +836,7 @@ do_group_members(
if ( strcasecmp( joinable[0], "FALSE" ) == 0 ) {
if ( ! anymembers ) {
add_error( err, nerr, E_NOMEMBERS, dn,
NULLMSG );
NULL );
}
ldap_value_free( joinable );
@ -903,7 +903,7 @@ do_group_members(
ndn = ldap_get_dn( ld, ee );
add_error( err, nerr,
E_JOINMEMBERNOEMAIL, ndn, NULLMSG );
E_JOINMEMBERNOEMAIL, ndn, NULL );
free( ndn );
}
@ -916,7 +916,7 @@ do_group_members(
}
if ( ! anymembers ) {
add_error( err, nerr, E_NOMEMBERS, dn, NULLMSG );
add_error( err, nerr, E_NOMEMBERS, dn, NULL );
}
}
@ -944,7 +944,7 @@ add_member(
if ( (rc = ldap_search_st( ld, dn, LDAP_SCOPE_BASE, "(objectclass=*)",
attrs, 0, &timeout, &res )) != LDAP_SUCCESS ) {
if ( rc == LDAP_NO_SUCH_OBJECT ) {
add_error( err, nerr, E_BADMEMBER, dn, NULLMSG );
add_error( err, nerr, E_BADMEMBER, dn, NULL );
return;
} else {
@ -983,7 +983,7 @@ add_member(
} else {
if ( suppress == NULL || strcasecmp( suppress[0], "FALSE" )
== 0 ) {
add_error( err, nerr, E_MEMBERNOEMAIL, ndn, NULLMSG );
add_error( err, nerr, E_MEMBERNOEMAIL, ndn, NULL );
}
}
@ -1008,7 +1008,7 @@ do_group_request(
ldap_value_free( requeststo );
} else {
add_error( err, nerr, E_NOREQUEST, dn, NULLMSG );
add_error( err, nerr, E_NOREQUEST, dn, NULL );
}
}
@ -1030,7 +1030,7 @@ do_group_errors(
ldap_value_free( errorsto );
} else {
add_error( err, nerr, E_NOERRORS, dn, NULLMSG );
add_error( err, nerr, E_NOERRORS, dn, NULL );
}
}
@ -1050,7 +1050,7 @@ do_group_owner(
add_to( to, nto, owner );
ldap_value_free( owner );
} else {
add_error( err, nerr, E_NOOWNER, dn, NULLMSG );
add_error( err, nerr, E_NOOWNER, dn, NULL );
}
}

2
clients/rcpt500/query.c
View file

@ -305,7 +305,7 @@ do_read( LDAP *ldp, char *dn, char *reply, struct ldap_disptmpl *tmpll )
static char **defvals[] = { maildefvals, NULL };
rc = ldap_entry2text_search( ldp, dn, searchbase, NULLMSG, tmpll,
rc = ldap_entry2text_search( ldp, dn, searchbase, NULL, tmpll,
defattrs, defvals, append_text, (void *)reply, "\n",
rdncount, LDAP_DISP_OPT_DOSEARCHACTIONS );

8
clients/tools/ldappasswd.c
View file

@ -570,9 +570,11 @@ main (int argc, char *argv[])
/* this is of questionable value
* gettimeofday not provide much usec
*/
struct timeval tv;
gettimeofday (&tv, NULL);
srand (tv.tv_usec);
{
struct timeval tv;
gettimeofday (&tv, NULL);
srand (tv.tv_usec);
}
#else
/* The traditional seed */
srand((unsigned)time( NULL ));