#include "auth/auth.h"
#include "librpc/gen_ndr/ndr_netlogon.h"
#include "auth/auth_sam.h"
-#include "auth/ntlm/ntlm_check.h"
-#include "pstring.h"
#include "libcli/auth/libcli_auth.h"
#include "libcli/security/security.h"
#include "lib/events/events.h"
typedef void (*stdio_helper_function)(enum stdio_helper_mode stdio_helper_mode,
struct loadparm_context *lp_ctx,
- char *buf, int length, void **private,
+ 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,
struct loadparm_context *lp_ctx,
- char *buf, int length, void **private,
+ char *buf, int length, void **private1,
unsigned int mux_id, void **private2);
static void manage_gensec_request (enum stdio_helper_mode stdio_helper_mode,
struct loadparm_context *lp_ctx,
- char *buf, int length, void **private,
+ 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,
struct loadparm_context *lp_ctx,
- char *buf, int length, void **private,
+ char *buf, int length, void **private1,
unsigned int mux_id, void **private2);
static void manage_squid_request(struct loadparm_context *lp_ctx,
/* 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, char winbind_separator)
+static bool parse_ntlm_auth_domain_user(const char *domuser, char **domain,
+ char **user, char winbind_separator)
{
char *p = strchr(domuser, winbind_separator);
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;
}
nt_status = ntlm_password_check(mem_ctx,
- lp_ctx,
+ lp_lanman_auth(lp_ctx),
+ lp_ntlm_auth(lp_ctx),
MSV1_0_ALLOW_SERVER_TRUST_ACCOUNT |
MSV1_0_ALLOW_WORKSTATION_TRUST_ACCOUNT,
challenge,
static void manage_squid_basic_request(enum stdio_helper_mode stdio_helper_mode,
struct loadparm_context *lp_ctx,
- char *buf, int length, void **private,
+ char *buf, int length, void **private1,
unsigned int mux_id, void **private2)
{
char *user, *pass;
static void manage_gensec_get_pw_request(enum stdio_helper_mode stdio_helper_mode,
struct loadparm_context *lp_ctx,
- char *buf, int length, void **private,
+ char *buf, int length, void **private1,
unsigned int mux_id, void **password)
{
DATA_BLOB in;
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) {
static void manage_gensec_request(enum stdio_helper_mode stdio_helper_mode,
struct loadparm_context *lp_ctx,
- char *buf, int length, void **private,
+ char *buf, int length, void **private1,
unsigned int mux_id, void **private2)
{
DATA_BLOB in;
const char *set_password;
};
struct gensec_ntlm_state *state;
- struct event_context *ev;
+ struct tevent_context *ev;
struct messaging_context *msg;
NTSTATUS nt_status;
TALLOC_CTX *mem_ctx;
- if (*private) {
- state = (struct gensec_ntlm_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;
}
if (!ev) {
exit(1);
}
+
+ mem_ctx = talloc_named(NULL, 0, "manage_gensec_request internal mem_ctx");
+
/* setup gensec */
if (!(state->gensec_state)) {
switch (stdio_helper_mode) {
case NTLMSSP_CLIENT_1:
/* setup the client side */
- nt_status = gensec_client_start(NULL, &state->gensec_state, ev, lp_ctx);
+ nt_status = gensec_client_start(NULL, &state->gensec_state, ev,
+ lp_gensec_settings(NULL, lp_ctx));
if (!NT_STATUS_IS_OK(nt_status)) {
+ talloc_free(mem_ctx);
exit(1);
}
break;
case GSS_SPNEGO_SERVER:
case SQUID_2_5_NTLMSSP:
- msg = messaging_client_init(state, lp_messaging_path(state, lp_ctx),
- lp_iconv_convenience(lp_ctx), ev);
+ {
+ const char *winbind_method[] = { "winbind", NULL };
+ struct auth_context *auth_context;
+
+ msg = messaging_client_init(state, lp_messaging_path(state, lp_ctx), ev);
if (!msg) {
+ talloc_free(mem_ctx);
+ exit(1);
+ }
+ nt_status = auth_context_create_methods(mem_ctx,
+ winbind_method,
+ ev,
+ msg,
+ lp_ctx,
+ &auth_context);
+
+ if (!NT_STATUS_IS_OK(nt_status)) {
+ talloc_free(mem_ctx);
exit(1);
}
- if (!NT_STATUS_IS_OK(gensec_server_start(state, ev, lp_ctx, 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))) {
+ talloc_free(mem_ctx);
exit(1);
}
break;
+ }
default:
+ talloc_free(mem_ctx);
abort();
}
nt_status = gensec_start_mech_by_oid(state->gensec_state, GENSEC_OID_NTLMSSP);
break;
default:
+ talloc_free(mem_ctx);
abort();
}
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 GENSEC mech failed to start\n");
+ talloc_free(mem_ctx);
return;
}
}
/* update */
- mem_ctx = talloc_named(NULL, 0, "manage_gensec_request internal mem_ctx");
-
+
if (strncmp(buf, "PW ", 3) == 0) {
state->set_password = talloc_strndup(state,
(const char *)in.data,
}
if (strncmp(buf, "GF", 2) == 0) {
- struct gensec_ntlmssp_state *gensec_ntlmssp_state;
+ struct ntlmssp_state *ntlmssp_state;
uint32_t neg_flags;
- gensec_ntlmssp_state = talloc_get_type(state->gensec_state->private_data,
- struct gensec_ntlmssp_state);
- neg_flags = gensec_ntlmssp_state->neg_flags;
+ ntlmssp_state = talloc_get_type(state->gensec_state->private_data,
+ struct ntlmssp_state);
+ neg_flags = ntlmssp_state->neg_flags;
DEBUG(10, ("Requested negotiated feature flags\n"));
mux_printf(mux_id, "GF 0x%08x\n", neg_flags);
if (!NT_STATUS_IS_OK(nt_status)) {
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)));
+ DEBUG(1, ("GENSEC failed to retrieve the session info: %s\n", nt_errstr(nt_status)));
} else {
reply_code = "AF";
static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mode,
struct loadparm_context *lp_ctx,
- char *buf, int length, void **private,
+ char *buf, int length, void **private1,
unsigned int mux_id, void **private2)
{
char *request, *parameter;
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,
- *lp_winbind_separator(lp_ctx))) {
+ 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) {
static struct mux_private *mux_private;
static void *normal_private;
- void **private;
+ void **private1;
buf = talloc_strdup(NULL, "");
(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, lp_ctx, c, length, private, mux_id, private2);
+ fn(helper_mode, lp_ctx, c, length, private1, mux_id, private2);
talloc_free(buf);
}
git.samba.org / bbaumbach / samba-autobuild / .git / blobdiff