diff options
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/Makefile.am | 7 | ||||
| -rw-r--r-- | daemon/httpauthd.c | 1 | ||||
| -rw-r--r-- | daemon/ldap.c | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 39a0532..6c9ef72 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -8,7 +8,8 @@ httpauthd_SOURCES = httpauthd.c httpauthd.h usuals.h compat.h compat.c \ smblib/smblib.c smblib/smblib-util.c smblib/file.c smblib/smb-errors.c smblib/exper.c smblib/smblib-api.c \ rfcnb/rfcnb-io.c rfcnb/rfcnb-util.c rfcnb/session.c -httpauthd_CFLAGS = -DLinux -I../common/ -I../ +httpauthd_CFLAGS = -D_THREAD_SAFE -pthread -DLinux \ + -I${top_srcdir}/common/ -I${top_srcdir} +httpauthd_LDFLAGS = -pthread -# man_MANS = rtfm.1 -EXTRA_DIST = protocol.txt smblib rfcnb +EXTRA_DIST = smblib rfcnb diff --git a/daemon/httpauthd.c b/daemon/httpauthd.c index 8c0f000..7c74754 100644 --- a/daemon/httpauthd.c +++ b/daemon/httpauthd.c @@ -309,7 +309,6 @@ int main(int argc, char* argv[]) break; case ECONNABORTED: - case EPROTO: ha_message(LOG_ERR, "couldn't accept a connection"); break; diff --git a/daemon/ldap.c b/daemon/ldap.c index a5abd97..78e048f 100644 --- a/daemon/ldap.c +++ b/daemon/ldap.c @@ -367,10 +367,11 @@ static const char* find_cleartext_password(ha_buffer_t* buf, const char** pws) static int parse_ldap_ha1(ha_buffer_t* buf, struct berval* bv, unsigned char* ha1) { - ASSERT(buf && bv && ha1); size_t len; void* d; + ASSERT(buf && bv && ha1); + /* Raw binary */ if(bv->bv_len == MD5_LEN) { @@ -1328,13 +1329,14 @@ int ldap_inithand(ha_context_t* context) void ldap_destroy(ha_context_t* context) { + ldap_context_t* ctx; int i; if(!context) return; /* Note: We don't need to be thread safe here anymore */ - ldap_context_t* ctx = (ldap_context_t*)(context->data); + ctx = (ldap_context_t*)(context->data); ASSERT(ctx); |