summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Hedenfal <martinh@cvs.openbsd.org>2010-06-27 18:31:14 +0000
committerMartin Hedenfal <martinh@cvs.openbsd.org>2010-06-27 18:31:14 +0000
commitdde4cdec8e8b1d545794581fc58534c37991f4da (patch)
tree610ce90ecda877da8eb36ef6c51a8ec8d8259ef3
parent85f58eddeb25c7a516c9b99194ab3a845e25c2d1 (diff)
return value unused, found by lint
-rw-r--r--usr.sbin/ldapd/conn.c8
-rw-r--r--usr.sbin/ldapd/ldapd.h4
2 files changed, 5 insertions, 7 deletions
diff --git a/usr.sbin/ldapd/conn.c b/usr.sbin/ldapd/conn.c
index 1204dd6dec3..a69af30b612 100644
--- a/usr.sbin/ldapd/conn.c
+++ b/usr.sbin/ldapd/conn.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conn.c,v 1.2 2010/05/31 18:29:04 martinh Exp $ */
+/* $OpenBSD: conn.c,v 1.3 2010/06/27 18:31:13 martinh Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -83,7 +83,7 @@ conn_disconnect(struct conn *conn)
bufferevent_enable(conn->bev, EV_WRITE);
}
-int
+void
request_dispatch(struct request *req)
{
unsigned long i;
@@ -109,7 +109,7 @@ request_dispatch(struct request *req)
if (req->conn->bind_req != NULL && req->type != LDAP_REQ_BIND) {
log_warnx("got request while bind in progress");
ldap_respond(req, LDAP_SASL_BIND_IN_PROGRESS);
- return 0;
+ return;
}
for (i = 0; requests[i].fn != NULL; i++) {
@@ -123,8 +123,6 @@ request_dispatch(struct request *req)
log_warnx("unhandled request %d (not implemented)", req->type);
ldap_respond(req, LDAP_PROTOCOL_ERROR);
}
-
- return 0;
}
int
diff --git a/usr.sbin/ldapd/ldapd.h b/usr.sbin/ldapd/ldapd.h
index 648e7f3cbe1..4b12b67f46d 100644
--- a/usr.sbin/ldapd/ldapd.h
+++ b/usr.sbin/ldapd/ldapd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ldapd.h,v 1.10 2010/06/27 16:24:17 martinh Exp $ */
+/* $OpenBSD: ldapd.h,v 1.11 2010/06/27 18:31:12 martinh Exp $ */
/*
* Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se>
@@ -414,7 +414,7 @@ void conn_err(struct bufferevent *bev, short w, void *data);
void conn_accept(int fd, short why, void *data);
void conn_close(struct conn *conn);
void conn_disconnect(struct conn *conn);
-int request_dispatch(struct request *req);
+void request_dispatch(struct request *req);
void request_free(struct request *req);
/* ldape.c */