Remove auth/ntlm as a dependency of GENSEC by means of function pointers.
[kai/samba-autobuild/.git] / source4 / utils / ntlm_auth.c
index fc864fd50ee5216292cfe1a15035930b100b7331..2c6f353252efafd7e0c8761c98231b85f26a7607 100644 (file)
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "auth/auth_sam.h"
-#include "pstring.h"
+#include "auth/ntlm/ntlm_check.h"
 #include "libcli/auth/libcli_auth.h"
 #include "libcli/security/security.h"
 #include "lib/events/events.h"
 #include "lib/messaging/messaging.h"
 #include "lib/messaging/irpc.h"
 #include "auth/ntlmssp/ntlmssp.h"
+#include "param/param.h"
 
-#define SQUID_BUFFER_SIZE 2010
+#define INITIAL_BUFFER_SIZE 300
+#define MAX_BUFFER_SIZE 63000
 
 enum stdio_helper_mode {
        SQUID_2_4_BASIC,
@@ -56,22 +58,27 @@ enum stdio_helper_mode {
 
 
 typedef void (*stdio_helper_function)(enum stdio_helper_mode stdio_helper_mode, 
-                                     char *buf, int length, void **private,
+                                     struct loadparm_context *lp_ctx,
+                                     char *buf, int length, void **private1,
                                      unsigned int mux_id, void **private2);
 
 static void manage_squid_basic_request (enum stdio_helper_mode stdio_helper_mode, 
-                                       char *buf, int length, void **private,
+                                       struct loadparm_context *lp_ctx,
+                                       char *buf, int length, void **private1,
                                        unsigned int mux_id, void **private2);
 
 static void manage_gensec_request (enum stdio_helper_mode stdio_helper_mode, 
-                                  char *buf, int length, void **private,
+                                  struct loadparm_context *lp_ctx,
+                                  char *buf, int length, void **private1,
                                   unsigned int mux_id, void **private2);
 
 static void manage_ntlm_server_1_request (enum stdio_helper_mode stdio_helper_mode, 
-                                         char *buf, int length, void **private,
+                                         struct loadparm_context *lp_ctx,
+                                         char *buf, int length, void **private1,
                                          unsigned int mux_id, void **private2);
 
-static void manage_squid_request(enum stdio_helper_mode helper_mode, 
+static void manage_squid_request(struct loadparm_context *lp_ctx,
+                                enum stdio_helper_mode helper_mode, 
                                 stdio_helper_function fn, void **private2);
 
 static const struct {
@@ -119,21 +126,21 @@ static void mux_printf(unsigned int mux_id, const char *format, ...)
 /* Copy of parse_domain_user from winbindd_util.c.  Parse a string of the
    form DOMAIN/user into a domain and a user */
 
-static BOOL parse_ntlm_auth_domain_user(const char *domuser, fstring domain, 
-                                       fstring user)
+static bool parse_ntlm_auth_domain_user(const char *domuser, char **domain, 
+                                                                               char **user, char winbind_separator)
 {
 
-       char *p = strchr(domuser,*lp_winbind_separator());
+       char *p = strchr(domuser, winbind_separator);
 
        if (!p) {
-               return False;
+               return false;
        }
         
-       fstrcpy(user, p+1);
-       fstrcpy(domain, domuser);
-       domain[PTR_DIFF(p, domuser)] = 0;
+       *user = smb_xstrdup(p+1);
+       *domain = smb_xstrdup(domuser);
+       (*domain)[PTR_DIFF(p, domuser)] = 0;
 
-       return True;
+       return true;
 }
 
 /**
@@ -166,15 +173,16 @@ static void base64_decode_inplace(char *s)
 
 /* Authenticate a user with a plaintext password */
 
-static BOOL check_plaintext_auth(const char *user, const char *pass, 
-                                BOOL stdout_diagnostics)
+static bool check_plaintext_auth(const char *user, const char *pass, 
+                                bool stdout_diagnostics)
 {
         return (strcmp(pass, opt_password) == 0);
 }
 
 /* authenticate a user with an encrypted username/password */
 
-static NTSTATUS local_pw_check_specified(const char *username, 
+static NTSTATUS local_pw_check_specified(struct loadparm_context *lp_ctx,
+                                        const char *username, 
                                         const char *domain, 
                                         const char *workstation,
                                         const DATA_BLOB *challenge, 
@@ -204,6 +212,8 @@ static NTSTATUS local_pw_check_specified(const char *username,
                
                
                nt_status = ntlm_password_check(mem_ctx, 
+                                               lp_lanman_auth(lp_ctx),
+                                               lp_ntlm_auth(lp_ctx),
                                                MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT |
                                                MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT,
                                                challenge,
@@ -218,7 +228,7 @@ static NTSTATUS local_pw_check_specified(const char *username,
                        if (unix_name) {
                                asprintf(unix_name, 
                                         "%s%c%s", domain,
-                                        *lp_winbind_separator(), 
+                                        *lp_winbind_separator(lp_ctx), 
                                         username);
                        }
                } else {
@@ -237,13 +247,14 @@ static NTSTATUS local_pw_check_specified(const char *username,
 }
 
 static void manage_squid_basic_request(enum stdio_helper_mode stdio_helper_mode, 
-                                      char *buf, int length, void **private,
+                                      struct loadparm_context *lp_ctx,
+                                      char *buf, int length, void **private1,
                                       unsigned int mux_id, void **private2) 
 {
        char *user, *pass;      
        user=buf;
        
-       pass=memchr(buf,' ',length);
+       pass = memchr(buf, ' ', length);
        if (!pass) {
                DEBUG(2, ("Password not found. Denying access\n"));
                mux_printf(mux_id, "ERR\n");
@@ -257,7 +268,7 @@ static void manage_squid_basic_request(enum stdio_helper_mode stdio_helper_mode,
                rfc1738_unescape(pass);
        }
        
-       if (check_plaintext_auth(user, pass, False)) {
+       if (check_plaintext_auth(user, pass, false)) {
                mux_printf(mux_id, "OK\n");
        } else {
                mux_printf(mux_id, "ERR\n");
@@ -268,13 +279,14 @@ static void manage_squid_basic_request(enum stdio_helper_mode stdio_helper_mode,
    to the calling application.  The callback comes from within gensec */
 
 static void manage_gensec_get_pw_request(enum stdio_helper_mode stdio_helper_mode, 
-                                        char *buf, int length, void **private,
+                                        struct loadparm_context *lp_ctx,
+                                        char *buf, int length, void **private1,
                                         unsigned int mux_id, void **password)  
 {
        DATA_BLOB in;
        if (strlen(buf) < 2) {
                DEBUG(1, ("query [%s] invalid", buf));
-               mux_printf(mux_id, "BH\n");
+               mux_printf(mux_id, "BH Query invalid\n");
                return;
        }
 
@@ -286,12 +298,12 @@ static void manage_gensec_get_pw_request(enum stdio_helper_mode stdio_helper_mod
 
        if (strncmp(buf, "PW ", 3) == 0) {
 
-               *password = talloc_strndup(*private /* hopefully the right gensec context, useful to use for talloc */,
+               *password = talloc_strndup(*private1 /* hopefully the right gensec context, useful to use for talloc */,
                                           (const char *)in.data, in.length);
                
                if (*password == NULL) {
                        DEBUG(1, ("Out of memory\n"));
-                       mux_printf(mux_id, "BH\n");
+                       mux_printf(mux_id, "BH Out of memory\n");
                        data_blob_free(&in);
                        return;
                }
@@ -301,13 +313,13 @@ static void manage_gensec_get_pw_request(enum stdio_helper_mode stdio_helper_mod
                return;
        }
        DEBUG(1, ("Asked for (and expected) a password\n"));
-       mux_printf(mux_id, "BH\n");
+       mux_printf(mux_id, "BH Expected a password\n");
        data_blob_free(&in);
 }
 
 /** 
- * Callback for password credentails.  This is not async, and when
- * GENSEC and the credentails code is made async, it will look rather
+ * Callback for password credentials.  This is not async, and when
+ * GENSEC and the credentials code is made async, it will look rather
  * different.
  */
 
@@ -316,31 +328,59 @@ static const char *get_password(struct cli_credentials *credentials)
        char *password = NULL;
        
        /* Ask for a password */
-       mux_printf((unsigned int)credentials->priv_data, "PW\n");
+       mux_printf((unsigned int)(uintptr_t)credentials->priv_data, "PW\n");
        credentials->priv_data = NULL;
 
-       manage_squid_request(NUM_HELPER_MODES /* bogus */, manage_gensec_get_pw_request, (void **)&password);
+       manage_squid_request(cmdline_lp_ctx, NUM_HELPER_MODES /* bogus */, manage_gensec_get_pw_request, (void **)&password);
        return password;
 }
 
+/**
+ Check if a string is part of a list.
+**/
+static bool in_list(const char *s, const char *list, bool casesensitive)
+{
+       char *tok;
+       size_t tok_len = 1024;
+       const char *p=list;
+
+       if (!list)
+               return false;
+
+       tok = (char *)malloc(tok_len);
+       if (!tok) {
+               return false;
+       }
+
+       while (next_token(&p, tok, LIST_SEP, tok_len)) {
+               if ((casesensitive?strcmp:strcasecmp_m)(tok,s) == 0) {
+                       free(tok);
+                       return true;
+               }
+       }
+       free(tok);
+       return false;
+}
+
 static void gensec_want_feature_list(struct gensec_security *state, char* feature_list)
 {
-       if (in_list("NTLMSSP_FEATURE_SESSION_KEY", feature_list, True)) {
+       if (in_list("NTLMSSP_FEATURE_SESSION_KEY", feature_list, true)) {
                DEBUG(10, ("want GENSEC_FEATURE_SESSION_KEY\n"));
                gensec_want_feature(state, GENSEC_FEATURE_SESSION_KEY);
        }
-       if (in_list("NTLMSSP_FEATURE_SIGN", feature_list, True)) {
+       if (in_list("NTLMSSP_FEATURE_SIGN", feature_list, true)) {
                DEBUG(10, ("want GENSEC_FEATURE_SIGN\n"));
                gensec_want_feature(state, GENSEC_FEATURE_SIGN);
        }
-       if (in_list("NTLMSSP_FEATURE_SEAL", feature_list, True)) {
+       if (in_list("NTLMSSP_FEATURE_SEAL", feature_list, true)) {
                DEBUG(10, ("want GENSEC_FEATURE_SEAL\n"));
                gensec_want_feature(state, GENSEC_FEATURE_SEAL);
        }
 }
 
 static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode, 
-                                 char *buf, int length, void **private,
+                                 struct loadparm_context *lp_ctx,
+                                 char *buf, int length, void **private1,
                                  unsigned int mux_id, void **private2) 
 {
        DATA_BLOB in;
@@ -352,11 +392,11 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                const char *set_password;
        };
        struct gensec_ntlm_state *state;
-       struct event_context *ev;
+       struct tevent_context *ev;
        struct messaging_context *msg;
 
        NTSTATUS nt_status;
-       BOOL first = False;
+       bool first = false;
        const char *reply_code;
        struct cli_credentials *creds;
 
@@ -365,15 +405,15 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
 
        TALLOC_CTX *mem_ctx;
 
-       if (*private) {
-               state = *private;
+       if (*private1) {
+               state = (struct gensec_ntlm_state *)*private1;
        } else {
                state = talloc_zero(NULL, struct gensec_ntlm_state);
                if (!state) {
                        mux_printf(mux_id, "BH No Memory\n");
                        exit(1);
                }
-               *private = state;
+               *private1 = state;
                if (opt_password) {
                        state->set_password = opt_password;
                }
@@ -381,7 +421,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
        
        if (strlen(buf) < 2) {
                DEBUG(1, ("query [%s] invalid", buf));
-               mux_printf(mux_id, "BH\n");
+               mux_printf(mux_id, "BH Query invalid\n");
                return;
        }
 
@@ -405,7 +445,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                }
        } else if ( (strncmp(buf, "OK", 2) == 0)) {
                /* Just return BH, like ntlm_auth from Samba 3 does. */
-               mux_printf(mux_id, "BH\n");
+               mux_printf(mux_id, "BH Command expected\n");
                data_blob_free(&in);
                return;
        } else if ( (strncmp(buf, "TT ", 3) != 0) &&
@@ -417,11 +457,15 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                    (strncmp(buf, "GK", 2) != 0) &&
                    (strncmp(buf, "GF", 2) != 0)) {
                DEBUG(1, ("SPNEGO request [%s] invalid\n", buf));
-               mux_printf(mux_id, "BH\n");
+               mux_printf(mux_id, "BH SPNEGO request invalid\n");
                data_blob_free(&in);
                return;
        }
 
+       ev = s4_event_context_init(state);
+       if (!ev) {
+               exit(1);
+       }
        /* setup gensec */
        if (!(state->gensec_state)) {
                switch (stdio_helper_mode) {
@@ -429,7 +473,8 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                case NTLMSSP_CLIENT_1:
                        /* setup the client side */
 
-                       nt_status = gensec_client_start(NULL, &state->gensec_state, NULL);
+                       nt_status = gensec_client_start(NULL, &state->gensec_state, ev, 
+                                                       lp_gensec_settings(NULL, lp_ctx));
                        if (!NT_STATUS_IS_OK(nt_status)) {
                                exit(1);
                        }
@@ -437,24 +482,39 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                        break;
                case GSS_SPNEGO_SERVER:
                case SQUID_2_5_NTLMSSP:
-                       ev = event_context_init(state);
-                       if (!ev) {
+               {
+                       const char *winbind_method[] = { "winbind", NULL };
+                       struct auth_context *auth_context;
+
+                       msg = messaging_client_init(state, lp_messaging_path(state, lp_ctx), 
+                                                   lp_iconv_convenience(lp_ctx), ev);
+                       if (!msg) {
                                exit(1);
                        }
-                       msg = messaging_client_init(state, ev);
-                       if (!msg) {
+                       nt_status = auth_context_create_methods(mem_ctx, 
+                                                               winbind_method,
+                                                               ev, 
+                                                               msg, 
+                                                               lp_ctx,
+                                                               &auth_context);
+       
+                       if (!NT_STATUS_IS_OK(nt_status)) {
                                exit(1);
                        }
-                       if (!NT_STATUS_IS_OK(gensec_server_start(state, ev, msg, &state->gensec_state))) {
+                       
+                       if (!NT_STATUS_IS_OK(gensec_server_start(state, ev, 
+                                                                lp_gensec_settings(state, lp_ctx), 
+                                                                auth_context, &state->gensec_state))) {
                                exit(1);
                        }
                        break;
+               }
                default:
                        abort();
                }
 
                creds = cli_credentials_init(state->gensec_state);
-               cli_credentials_set_conf(creds);
+               cli_credentials_set_conf(creds, lp_ctx);
                if (opt_username) {
                        cli_credentials_set_username(creds, opt_username, CRED_SPECIFIED);
                }
@@ -465,7 +525,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                        cli_credentials_set_password(creds, state->set_password, CRED_SPECIFIED);
                } else {
                        cli_credentials_set_password_callback(creds, get_password);
-                       creds->priv_data = (void*)mux_id;
+                       creds->priv_data = (void*)(uintptr_t)mux_id;
                }
                if (opt_workstation) {
                        cli_credentials_set_workstation(creds, opt_workstation, CRED_SPECIFIED);
@@ -474,7 +534,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                switch (stdio_helper_mode) {
                case GSS_SPNEGO_SERVER:
                case SQUID_2_5_NTLMSSP:
-                       cli_credentials_set_machine_account(creds);
+                       cli_credentials_set_machine_account(creds, lp_ctx);
                        break;
                default:
                        break;
@@ -488,12 +548,12 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                case GSS_SPNEGO_SERVER:
                        nt_status = gensec_start_mech_by_oid(state->gensec_state, GENSEC_OID_SPNEGO);
                        if (!in.length) {
-                               first = True;
+                               first = true;
                        }
                        break;
                case NTLMSSP_CLIENT_1:
                        if (!in.length) {
-                               first = True;
+                               first = true;
                        }
                        /* fall through */
                case SQUID_2_5_NTLMSSP:
@@ -505,7 +565,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
 
                if (!NT_STATUS_IS_OK(nt_status)) {
                        DEBUG(1, ("GENSEC mech failed to start: %s\n", nt_errstr(nt_status)));
-                       mux_printf(mux_id, "BH\n");
+                       mux_printf(mux_id, "BH GENSEC mech failed to start\n");
                        return;
                }
 
@@ -549,7 +609,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                        struct security_token *token = session_info->security_token; 
                        const char *sidstr = dom_sid_string(session_info, 
                                                            token->sids[i]);
-                       grouplist = talloc_asprintf_append(grouplist, "%s,", sidstr);
+                       grouplist = talloc_asprintf_append_buffer(grouplist, "%s,", sidstr);
                }
 
                mux_printf(mux_id, "GL %s\n", grouplist);
@@ -615,11 +675,11 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
 
 
        } else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_ACCESS_DENIED)) {
-               reply_code = "BH";
+               reply_code = "BH NT_STATUS_ACCESS_DENIED";
                reply_arg = nt_errstr(nt_status);
                DEBUG(1, ("GENSEC login failed: %s\n", nt_errstr(nt_status)));
        } else if (NT_STATUS_EQUAL(nt_status, NT_STATUS_UNSUCCESSFUL)) {
-               reply_code = "BH";
+               reply_code = "BH NT_STATUS_UNSUCCESSFUL";
                reply_arg = nt_errstr(nt_status);
                DEBUG(1, ("GENSEC login failed: %s\n", nt_errstr(nt_status)));
        } else if (!NT_STATUS_IS_OK(nt_status)) {
@@ -631,7 +691,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
 
                nt_status = gensec_session_info(state->gensec_state, &session_info);
                if (!NT_STATUS_IS_OK(nt_status)) {
-                       reply_code = "BH";
+                       reply_code = "BH Failed to retrive session info";
                        reply_arg = nt_errstr(nt_status);
                        DEBUG(1, ("GENSEC failed to retreive the session info: %s\n", nt_errstr(nt_status)));
                } else {
@@ -639,7 +699,7 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
                        reply_code = "AF";
                        reply_arg = talloc_asprintf(state->gensec_state, 
                                                    "%s%s%s", session_info->server_info->domain_name, 
-                                                   lp_winbind_separator(), session_info->server_info->account_name);
+                                                   lp_winbind_separator(lp_ctx), session_info->server_info->account_name);
                        talloc_free(session_info);
                }
        } else if (state->gensec_state->gensec_role == GENSEC_CLIENT) {
@@ -670,7 +730,8 @@ static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
 }
 
 static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mode, 
-                                        char *buf, int length, void **private,
+                                        struct loadparm_context *lp_ctx,
+                                        char *buf, int length, void **private1,
                                         unsigned int mux_id, void **private2) 
 {
        char *request, *parameter;      
@@ -681,8 +742,8 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
        static char *username;
        static char *domain;
        static char *plaintext_password;
-       static BOOL ntlm_server_1_user_session_key;
-       static BOOL ntlm_server_1_lm_session_key;
+       static bool ntlm_server_1_user_session_key;
+       static bool ntlm_server_1_lm_session_key;
        
        if (strequal(buf, ".")) {
                if (!full_username && !username) {      
@@ -690,12 +751,12 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
                } else if (plaintext_password) {
                        /* handle this request as plaintext */
                        if (!full_username) {
-                               if (asprintf(&full_username, "%s%c%s", domain, *lp_winbind_separator(), username) == -1) {
+                               if (asprintf(&full_username, "%s%c%s", domain, *lp_winbind_separator(lp_ctx), username) == -1) {
                                        mux_printf(mux_id, "Error: Out of memory in asprintf!\n.\n");
                                        return;
                                }
                        }
-                       if (check_plaintext_auth(full_username, plaintext_password, False)) {
+                       if (check_plaintext_auth(full_username, plaintext_password, false)) {
                                mux_printf(mux_id, "Authenticated: Yes\n");
                        } else {
                                mux_printf(mux_id, "Authenticated: No\n");
@@ -711,21 +772,18 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
                        uint32_t flags = 0;
 
                        if (full_username && !username) {
-                               fstring fstr_user;
-                               fstring fstr_domain;
-                               
-                               if (!parse_ntlm_auth_domain_user(full_username, fstr_user, fstr_domain)) {
+                               SAFE_FREE(username);
+                               SAFE_FREE(domain);
+                               if (!parse_ntlm_auth_domain_user(full_username, &username, 
+                                                                                                &domain, 
+                                                                                                *lp_winbind_separator(lp_ctx))) {
                                        /* username might be 'tainted', don't print into our new-line deleimianted stream */
                                        mux_printf(mux_id, "Error: Could not parse into domain and username\n");
                                }
-                               SAFE_FREE(username);
-                               SAFE_FREE(domain);
-                               username = smb_xstrdup(fstr_user);
-                               domain = smb_xstrdup(fstr_domain);
                        }
 
                        if (!domain) {
-                               domain = smb_xstrdup(lp_workgroup());
+                               domain = smb_xstrdup(lp_workgroup(lp_ctx));
                        }
 
                        if (ntlm_server_1_lm_session_key) 
@@ -735,9 +793,10 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
                                flags |= NTLM_AUTH_FLAG_USER_SESSION_KEY;
 
                        if (!NT_STATUS_IS_OK(
-                                   local_pw_check_specified(username, 
+                                   local_pw_check_specified(lp_ctx,
+                                                            username, 
                                                              domain, 
-                                                             lp_netbios_name(),
+                                                             lp_netbios_name(lp_ctx),
                                                              &challenge, 
                                                              &lm_response, 
                                                              &nt_response, 
@@ -788,8 +847,8 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
                SAFE_FREE(username);
                SAFE_FREE(domain);
                SAFE_FREE(plaintext_password);
-               ntlm_server_1_user_session_key = False;
-               ntlm_server_1_lm_session_key = False;
+               ntlm_server_1_user_session_key = false;
+               ntlm_server_1_lm_session_key = false;
                mux_printf(mux_id, ".\n");
 
                return;
@@ -825,7 +884,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
        }
 
        if (strequal(request, "LANMAN-Challenge")) {
-               challenge = strhex_to_data_blob(parameter);
+               challenge = strhex_to_data_blob(NULL, parameter);
                if (challenge.length != 8) {
                        mux_printf(mux_id, "Error: hex decode of %s failed! (got %d bytes, expected 8)\n.\n", 
                                  parameter,
@@ -833,7 +892,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
                        challenge = data_blob(NULL, 0);
                }
        } else if (strequal(request, "NT-Response")) {
-               nt_response = strhex_to_data_blob(parameter);
+               nt_response = strhex_to_data_blob(NULL, parameter);
                if (nt_response.length < 24) {
                        mux_printf(mux_id, "Error: hex decode of %s failed! (only got %d bytes, needed at least 24)\n.\n", 
                                  parameter,
@@ -841,7 +900,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
                        nt_response = data_blob(NULL, 0);
                }
        } else if (strequal(request, "LANMAN-Response")) {
-               lm_response = strhex_to_data_blob(parameter);
+               lm_response = strhex_to_data_blob(NULL, parameter);
                if (lm_response.length != 24) {
                        mux_printf(mux_id, "Error: hex decode of %s failed! (got %d bytes, expected 24)\n.\n", 
                                  parameter,
@@ -865,54 +924,68 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
        }
 }
 
-static void manage_squid_request(enum stdio_helper_mode helper_mode, 
+static void manage_squid_request(struct loadparm_context *lp_ctx, enum stdio_helper_mode helper_mode, 
                                 stdio_helper_function fn, void **private2) 
 {
-       char buf[SQUID_BUFFER_SIZE+1];
+       char *buf;
+       char tmp[INITIAL_BUFFER_SIZE+1];
        unsigned int mux_id = 0;
-       int length;
+       int length, buf_size = 0;
        char *c;
-       static BOOL err;
        struct mux_private {
                unsigned int max_mux;
                void **private_pointers;
        };
-       
+
        static struct mux_private *mux_private;
        static void *normal_private;
-       void **private;
+       void **private1;
 
-       /* this is not a typo - x_fgets doesn't work too well under squid */
-       if (fgets(buf, sizeof(buf)-1, stdin) == NULL) {
-               if (ferror(stdin)) {
-                       DEBUG(1, ("fgets() failed! dying..... errno=%d (%s)\n", ferror(stdin),
-                                 strerror(ferror(stdin))));
-                       
-                       exit(1);    /* BIIG buffer */
-               }
-               exit(0);
-       }
-    
-       c=memchr(buf,'\n',sizeof(buf)-1);
-       if (c) {
-               *c = '\0';
-               length = c-buf;
-       } else {
-               err = 1;
-               return;
-       }
-       if (err) {
-               DEBUG(0, ("Oversized message\n"));
+       buf = talloc_strdup(NULL, "");
+
+       if (buf == NULL) {
+               DEBUG(0, ("Failed to allocate memory for reading the input "
+                         "buffer.\n"));
                x_fprintf(x_stdout, "ERR\n");
-               err = 0;
                return;
        }
 
+       do {
+               /* this is not a typo - x_fgets doesn't work too well under
+                * squid */
+               if (fgets(tmp, INITIAL_BUFFER_SIZE, stdin) == NULL) {
+                       if (ferror(stdin)) {
+                               DEBUG(1, ("fgets() failed! dying..... errno=%d "
+                                         "(%s)\n", ferror(stdin),
+                                         strerror(ferror(stdin))));
+
+                               exit(1);    /* BIIG buffer */
+                       }
+                       exit(0);
+               }
+
+               buf = talloc_strdup_append_buffer(buf, tmp);
+               buf_size += INITIAL_BUFFER_SIZE;
+
+               if (buf_size > MAX_BUFFER_SIZE) {
+                       DEBUG(0, ("Invalid Request (too large)\n"));
+                       x_fprintf(x_stdout, "ERR\n");
+                       talloc_free(buf);
+                       return;
+               }
+
+               c = strchr(buf, '\n');
+       } while (c == NULL);
+
+       *c = '\0';
+       length = c-buf;
+
        DEBUG(10, ("Got '%s' from squid (length: %d).\n",buf,length));
 
        if (buf[0] == '\0') {
                DEBUG(0, ("Invalid Request (empty)\n"));
                x_fprintf(x_stdout, "ERR\n");
+               talloc_free(buf);
                return;
        }
 
@@ -920,6 +993,7 @@ static void manage_squid_request(enum stdio_helper_mode helper_mode,
                if (sscanf(buf, "%u ", &mux_id) != 1) {
                        DEBUG(0, ("Invalid Request - no multiplex id\n"));
                        x_fprintf(x_stdout, "ERR\n");
+                       talloc_free(buf);
                        return;
                }
                if (!mux_private) {
@@ -932,6 +1006,7 @@ static void manage_squid_request(enum stdio_helper_mode helper_mode,
                if (!c) {
                        DEBUG(0, ("Invalid Request - no data after multiplex id\n"));
                        x_fprintf(x_stdout, "ERR\n");
+                       talloc_free(buf);
                        return;
                }
                c++;
@@ -946,22 +1021,24 @@ static void manage_squid_request(enum stdio_helper_mode helper_mode,
                               (sizeof(*mux_private->private_pointers) * (mux_private->max_mux - prev_max))); 
                };
 
-               private = &mux_private->private_pointers[mux_id];
+               private1 = &mux_private->private_pointers[mux_id];
        } else {
                c = buf;
-               private = &normal_private;
+               private1 = &normal_private;
        }
-       
-       fn(helper_mode, c, length, private, mux_id, private2);
+
+       fn(helper_mode, lp_ctx, c, length, private1, mux_id, private2);
+       talloc_free(buf);
 }
 
-static void squid_stream(enum stdio_helper_mode stdio_mode, 
+static void squid_stream(struct loadparm_context *lp_ctx, 
+                        enum stdio_helper_mode stdio_mode, 
                         stdio_helper_function fn) {
        /* initialize FDescs */
        x_setbuf(x_stdout, NULL);
        x_setbuf(x_stderr, NULL);
        while(1) {
-               manage_squid_request(stdio_mode, fn, NULL);
+               manage_squid_request(lp_ctx, stdio_mode, fn, NULL);
        }
 }
 
@@ -1044,17 +1121,17 @@ int main(int argc, const char **argv)
                return 1;
        }
 
-       gensec_init();
+       gensec_init(cmdline_lp_ctx);
 
        if (opt_domain == NULL) {
-               opt_domain = lp_workgroup();
+               opt_domain = lp_workgroup(cmdline_lp_ctx);
        }
 
        if (helper_protocol) {
                int i;
                for (i=0; i<NUM_HELPER_MODES; i++) {
                        if (strcmp(helper_protocol, stdio_helper_protocols[i].name) == 0) {
-                               squid_stream(stdio_helper_protocols[i].mode, stdio_helper_protocols[i].fn);
+                               squid_stream(cmdline_lp_ctx, stdio_helper_protocols[i].mode, stdio_helper_protocols[i].fn);
                                exit(0);
                        }
                }
@@ -1074,7 +1151,7 @@ int main(int argc, const char **argv)
        }
 
        if (opt_workstation == NULL) {
-               opt_workstation = lp_netbios_name();
+               opt_workstation = lp_netbios_name(cmdline_lp_ctx);
        }
 
        if (!opt_password) {
@@ -1084,8 +1161,8 @@ int main(int argc, const char **argv)
        {
                char *user;
 
-               asprintf(&user, "%s%c%s", opt_domain, *lp_winbind_separator(), opt_username);
-               if (!check_plaintext_auth(user, opt_password, True)) {
+               asprintf(&user, "%s%c%s", opt_domain, *lp_winbind_separator(cmdline_lp_ctx), opt_username);
+               if (!check_plaintext_auth(user, opt_password, true)) {
                        return 1;
                }
        }