diff options
| author | Martin Hedenfal <martinh@cvs.openbsd.org> | 2010-07-01 02:19:12 +0000 |
|---|---|---|
| committer | Martin Hedenfal <martinh@cvs.openbsd.org> | 2010-07-01 02:19:12 +0000 |
| commit | 4716bf471cde28d86c268064b1d84401ca0b7bd1 (patch) | |
| tree | 694fcd50cae870d91e114f6e1e8c7f9568f98cf2 /usr.sbin/ldapd/search.c | |
| parent | ba20962e4d51a20b1a146917fc3756a50cf97221 (diff) | |
Remove dead assignments. Found by clang static analyzer.
Diffstat (limited to 'usr.sbin/ldapd/search.c')
| -rw-r--r-- | usr.sbin/ldapd/search.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/usr.sbin/ldapd/search.c b/usr.sbin/ldapd/search.c index e9e73b221a1..bdcaaafc4ef 100644 --- a/usr.sbin/ldapd/search.c +++ b/usr.sbin/ldapd/search.c @@ -1,4 +1,4 @@ -/* $OpenBSD: search.c,v 1.8 2010/06/29 21:54:38 martinh Exp $ */ +/* $OpenBSD: search.c,v 1.9 2010/07/01 02:19:11 martinh Exp $ */ /* * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se> @@ -495,13 +495,13 @@ ldap_search_root_dse(struct search *search) elm = ber_add_sequence(elm); key = ber_add_string(elm, "supportedExtension"); val = ber_add_set(key); - val = ber_add_string(val, "1.3.6.1.4.1.1466.20037"); /* StartTLS */ + ber_add_string(val, "1.3.6.1.4.1.1466.20037"); /* StartTLS */ elm = ber_add_sequence(elm); key = ber_add_string(elm, "supportedFeatures"); val = ber_add_set(key); /* All Operational Attributes (RFC 3673) */ - val = ber_add_string(val, "1.3.6.1.4.1.4203.1.5.1"); + ber_add_string(val, "1.3.6.1.4.1.4203.1.5.1"); elm = ber_add_sequence(elm); key = ber_add_string(elm, "subschemaSubentry"); @@ -707,7 +707,6 @@ ldap_search(struct request *req) long long reason = LDAP_OTHER; struct referrals *refs; struct search *search = NULL; - int rc; if (stats.searches > MAX_SEARCHES) { log_warnx("refusing more than %u concurrent searches", @@ -799,8 +798,8 @@ ldap_search(struct request *req) goto done; } - if ((rc = namespace_begin_txn(search->ns, &search->data_txn, - &search->indx_txn, 1)) != BT_SUCCESS) { + if (namespace_begin_txn(search->ns, &search->data_txn, + &search->indx_txn, 1) != BT_SUCCESS) { if (errno == EBUSY) { if (namespace_queue_request(search->ns, req) != 0) { reason = LDAP_BUSY; |