summaryrefslogtreecommitdiff
path: root/src/mod_auth.c
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2015-02-08 12:37:10 +0000
committerStefan Bühler <stbuehler@web.de>2015-02-08 12:37:10 +0000
commit6afad87d2ed66a48cda2a7c01dbcc59023774b73 (patch)
tree9b371e94cf911630c5794f5b4ff6e3edd6439a3b /src/mod_auth.c
parent3521be8b8599ae2cc12361c8f600fc58a473de91 (diff)
downloadlighttpd-git-6afad87d2ed66a48cda2a7c01dbcc59023774b73.tar.gz
fix buffer, chunk and http_chunk API
* remove unused structs and functions (buffer_array, read_buffer) * change return type from int to void for many functions, as the return value (indicating error/success) was never checked, and the function would only fail on programming errors and not on invalid input; changed functions to use force_assert instead of returning an error. * all "len" parameters now are the real size of the memory to be read. the length of strings is given always without the terminating 0. * the "buffer" struct still counts the terminating 0 in ->used, provide buffer_string_length() to get the length of a string in a buffer. unset config "strings" have used == 0, which is used in some places to distinguish unset values from "" (empty string) values. * most buffer usages should now use it as string container. * optimise some buffer copying by "moving" data to other buffers * use (u)intmax_t for generic int-to-string functions * remove unused enum values: UNUSED_CHUNK, ENCODING_UNSET * converted BUFFER_APPEND_SLASH to inline function (no macro feature needed) * refactor: create chunkqueue_steal: moving (partial) chunks into another queue * http_chunk: added separate function to terminate chunked body instead of magic handling in http_chunk_append_mem(). http_chunk_append_* now handle empty chunks, and never terminate the chunked body. From: Stefan Bühler <stbuehler@web.de> git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2975 152afb58-edef-0310-8abb-c4023f1b3aa9
Diffstat (limited to 'src/mod_auth.c')
-rw-r--r--src/mod_auth.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mod_auth.c b/src/mod_auth.c
index 31e1140b..d5a3f1c9 100644
--- a/src/mod_auth.c
+++ b/src/mod_auth.c
@@ -324,7 +324,7 @@ static handler_t mod_auth_uri_handler(server *srv, connection *con, void *p_d) {
buffer_copy_string(ds->key, "REMOTE_USER");
array_insert_unique(con->environment, (data_unset *)ds);
}
- buffer_copy_string_buffer(ds->value, p->auth_user);
+ buffer_copy_buffer(ds->value, p->auth_user);
/* AUTH_TYPE environment */
@@ -535,7 +535,7 @@ SETDEFAULTS_FUNC(mod_auth_set_defaults) {
data_array *a;
a = data_array_init();
- buffer_copy_string_buffer(a->key, da_file->key);
+ buffer_copy_buffer(a->key, da_file->key);
ds = data_string_init();
@@ -608,7 +608,7 @@ handler_t auth_ldap_init(server *srv, mod_auth_plugin_config *s) {
if (s->auth_ldap_starttls) {
/* if no CA file is given, it is ok, as we will use encryption
* if the server requires a CAfile it will tell us */
- if (!buffer_is_empty(s->auth_ldap_cafile)) {
+ if (!buffer_string_is_empty(s->auth_ldap_cafile)) {
if (LDAP_OPT_SUCCESS != (ret = ldap_set_option(NULL, LDAP_OPT_X_TLS_CACERTFILE,
s->auth_ldap_cafile->ptr))) {
log_error_write(srv, __FILE__, __LINE__, "ss",