diff options
| author | Nathan Kinder <nkinder@redhat.com> | 2006-08-31 22:52:13 +0000 |
|---|---|---|
| committer | Nathan Kinder <nkinder@redhat.com> | 2006-08-31 22:52:13 +0000 |
| commit | e5be59676dcf75e5cda532d54bdae6e215a0c489 (patch) | |
| tree | c3ebf744aaa7eea0236ae4d52b656c7ce6862c7a /ldap/servers/slapd/search.c | |
| parent | 6d6a3bbe1a051ff3b144b2c31172f9e4bf858888 (diff) | |
| download | ds-e5be59676dcf75e5cda532d54bdae6e215a0c489.tar.gz ds-e5be59676dcf75e5cda532d54bdae6e215a0c489.tar.xz ds-e5be59676dcf75e5cda532d54bdae6e215a0c489.zip | |
204517 - Use new ber types throughout the server code.
Diffstat (limited to 'ldap/servers/slapd/search.c')
| -rw-r--r-- | ldap/servers/slapd/search.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/ldap/servers/slapd/search.c b/ldap/servers/slapd/search.c index f52cd53e..fc629f6f 100644 --- a/ldap/servers/slapd/search.c +++ b/ldap/servers/slapd/search.c @@ -61,16 +61,14 @@ do_search( Slapi_PBlock *pb ) { Slapi_Operation *operation; BerElement *ber; - int i, err; - int scope, deref, attrsonly; - int sizelimit, timelimit; - long long_scope,long_deref,long_sizelimit,long_timelimit; + int i, err, attrsonly; + ber_int_t scope, deref, sizelimit, timelimit; char *base = NULL, *fstr = NULL; struct slapi_filter *filter = NULL; char **attrs = NULL; int psearch = 0; struct berval *psbvp; - int changetypes; + ber_int_t changetypes; int send_entchg_controls; int changesonly = 0; int rc = -1; @@ -110,16 +108,12 @@ do_search( Slapi_PBlock *pb ) */ /* baseObject, scope, derefAliases, sizelimit, timelimit, attrsOnly */ - if ( ber_scanf( ber, "{aiiiib", &base, &long_scope, &long_deref, &long_sizelimit, &long_timelimit, &attrsonly ) == LBER_ERROR ){ + if ( ber_scanf( ber, "{aiiiib", &base, &scope, &deref, &sizelimit, &timelimit, &attrsonly ) == LBER_ERROR ){ slapi_ch_free((void**)&base ); log_search_access (pb, "???", -1, "???", "decoding error"); send_ldap_result( pb, LDAP_PROTOCOL_ERROR, NULL, NULL, 0, NULL ); return; } - scope = long_scope; - deref = long_deref; - sizelimit = long_sizelimit; - timelimit = long_timelimit; /* * ignore negative time and size limits since they make no sense |