diff options
| author |   rob <rob@openbsd.org> | 2018-08-12 22:04:09 +0000 |
|---|---|---|
| committer | rob <rob@openbsd.org> | 2018-08-12 22:04:09 +0000 |
| commit | 73774627fc9ffd0d85c6e5026e4a7cc50e32fb55 (patch) | |
| tree | 7721c7c318dd7ea942badb141477ba450fbd67e8 /usr.sbin/ldapd | |
| parent | better diagnosics on alg list assembly errors; ok deraadt@ markus@ (diff) | |
| download | wireguard-openbsd-73774627fc9ffd0d85c6e5026e4a7cc50e32fb55.tar.xz wireguard-openbsd-73774627fc9ffd0d85c6e5026e4a7cc50e32fb55.zip | |
Change ber_write_elements() to return ssize_t instead of int.
ok claudio@
Diffstat (limited to 'usr.sbin/ldapd')
| -rw-r--r-- | usr.sbin/ldapd/ber.c | 4 | ||||
| -rw-r--r-- | usr.sbin/ldapd/ber.h | 4 | ||||
| -rw-r--r-- | usr.sbin/ldapd/ldape.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/ldapd/ber.c b/usr.sbin/ldapd/ber.c index 2a53f6efa2a..b76fa45a7d2 100644 --- a/usr.sbin/ldapd/ber.c +++ b/usr.sbin/ldapd/ber.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.c,v 1.28 2018/08/03 01:51:28 rob Exp $ */ +/* $OpenBSD: ber.c,v 1.29 2018/08/12 22:04:09 rob Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org> @@ -802,7 +802,7 @@ ber_get_writebuf(struct ber *b, void **buf) * >=0 number of bytes written * -1 on failure and sets errno */ -int +ssize_t ber_write_elements(struct ber *ber, struct ber_element *root) { size_t len; diff --git a/usr.sbin/ldapd/ber.h b/usr.sbin/ldapd/ber.h index 5e9c7aeacfa..9004373b084 100644 --- a/usr.sbin/ldapd/ber.h +++ b/usr.sbin/ldapd/ber.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ber.h,v 1.7 2018/08/03 01:51:28 rob Exp $ */ +/* $OpenBSD: ber.h,v 1.8 2018/08/12 22:04:09 rob Exp $ */ /* * Copyright (c) 2007, 2012 Reyk Floeter <reyk@openbsd.org> @@ -124,7 +124,7 @@ int ber_string2oid(const char *, struct ber_oid *); struct ber_element *ber_printf_elements(struct ber_element *, char *, ...); int ber_scanf_elements(struct ber_element *, char *, ...); ssize_t ber_get_writebuf(struct ber *, void **); -int ber_write_elements(struct ber *, struct ber_element *); +ssize_t ber_write_elements(struct ber *, struct ber_element *); void ber_set_readbuf(struct ber *, void *, size_t); struct ber_element *ber_read_elements(struct ber *, struct ber_element *); off_t ber_getpos(struct ber_element *); diff --git a/usr.sbin/ldapd/ldape.c b/usr.sbin/ldapd/ldape.c index 1d852f1ff7c..268fd6bddee 100644 --- a/usr.sbin/ldapd/ldape.c +++ b/usr.sbin/ldapd/ldape.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ldape.c,v 1.29 2018/07/31 11:01:00 claudio Exp $ */ +/* $OpenBSD: ldape.c,v 1.30 2018/08/12 22:04:09 rob Exp $ */ /* * Copyright (c) 2009, 2010 Martin Hedenfalk <martin@bzero.se> @@ -72,7 +72,7 @@ void send_ldap_extended_response(struct conn *conn, int msgid, unsigned int type, long long result_code, const char *extended_oid) { - int rc; + ssize_t rc; struct ber_element *root, *elm; void *buf; @@ -117,7 +117,7 @@ ldap_refer(struct request *req, const char *basedn, struct search *search, struct referral *ref; long long result_code = LDAP_REFERRAL; unsigned int type; - int rc; + ssize_t rc; void *buf; char *url, *scope_str = NULL; |