mirror of
https://github.com/samba-team/samba.git
synced 2025-03-12 20:58:37 +03:00
af237084ec
event_context for the socket_connect() call, so that when things that
use dcerpc are running alongside anything else it doesn't block the
whole process during a connect.
Then of course I needed to change any code that created a dcerpc
connection (such as the auth code) to also take an event context, and
anything that called that and so on .... thus the size of the patch.
There were 3 places where I punted:
- abartlet wanted me to add a gensec_set_event_context() call
instead of adding it to the gensec init calls. Andrew, my
apologies for not doing this. I didn't do it as adding a new
parameter allowed me to catch all the callers with the
compiler. Now that its done, we could go back and use
gensec_set_event_context()
- the ejs code calls auth initialisation, which means it should pass
in the event context from the web server. I punted on that. Needs fixing.
- I used a NULL event context in dcom_get_pipe(). This is equivalent
to what we did already, but should be fixed to use a callers event
context. Jelmer, can you think of a clean way to do that?
I also cleaned up a couple of things:
- libnet_context_destroy() makes no sense. I removed it.
- removed some unused vars in various places
(This used to be commit 3a3025485bdb8f600ab528c0b4b4eef0c65e3fc9)
97 lines
2.8 KiB
C
97 lines
2.8 KiB
C
/*
|
|
Samba Unix/Linux SMB client library
|
|
Distributed SMB/CIFS Server Management Utility
|
|
|
|
Copyright (C) 2004 Stefan Metzmacher <metze@samba.org>
|
|
Copyright (C) 2005 Andrew Bartlett <abartlet@samba.org>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include "includes.h"
|
|
#include "utils/net/net.h"
|
|
#include "libnet/libnet.h"
|
|
#include "librpc/gen_ndr/ndr_samr.h"
|
|
|
|
int net_join(struct net_context *ctx, int argc, const char **argv)
|
|
{
|
|
NTSTATUS status;
|
|
struct libnet_context *libnetctx;
|
|
union libnet_Join r;
|
|
char *tmp;
|
|
const char *domain_name;
|
|
enum netr_SchannelType secure_channel_type = SEC_CHAN_WKSTA;
|
|
|
|
switch (argc) {
|
|
case 0: /* no args -> fail */
|
|
return net_join_usage(ctx, argc, argv);
|
|
case 1: /* only DOMAIN */
|
|
tmp = talloc_strdup(ctx->mem_ctx, argv[0]);
|
|
break;
|
|
case 2: /* DOMAIN and role */
|
|
tmp = talloc_strdup(ctx->mem_ctx, argv[0]);
|
|
if (strcasecmp(argv[1], "BDC") == 0) {
|
|
secure_channel_type = SEC_CHAN_BDC;
|
|
} else if (strcasecmp(argv[1], "MEMBER") == 0) {
|
|
secure_channel_type = SEC_CHAN_WKSTA;
|
|
} else {
|
|
DEBUG(0, ("net_join: 2nd argument must be MEMBER or BDC\n"));
|
|
return net_join_usage(ctx, argc, argv);
|
|
}
|
|
break;
|
|
default: /* too many args -> fail */
|
|
return net_join_usage(ctx, argc, argv);
|
|
}
|
|
|
|
domain_name = tmp;
|
|
|
|
libnetctx = libnet_context_init(NULL);
|
|
if (!libnetctx) {
|
|
return -1;
|
|
}
|
|
libnetctx->cred = ctx->credentials;
|
|
|
|
/* prepare password change */
|
|
r.generic.level = LIBNET_JOIN_GENERIC;
|
|
r.generic.in.domain_name = domain_name;
|
|
r.generic.in.secure_channel_type = secure_channel_type;
|
|
r.generic.out.error_string = NULL;
|
|
|
|
/* do the domain join */
|
|
status = libnet_Join(libnetctx, ctx->mem_ctx, &r);
|
|
if (!NT_STATUS_IS_OK(status)) {
|
|
DEBUG(0,("libnet_Join returned %s: %s\n",
|
|
nt_errstr(status),
|
|
r.generic.out.error_string));
|
|
return -1;
|
|
}
|
|
|
|
talloc_free(libnetctx);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int net_join_usage(struct net_context *ctx, int argc, const char **argv)
|
|
{
|
|
d_printf("net join <domain> [BDC | MEMBER] [options]\n");
|
|
return 0;
|
|
}
|
|
|
|
int net_join_help(struct net_context *ctx, int argc, const char **argv)
|
|
{
|
|
d_printf("Joins domain as either member or backup domain controller.\n");
|
|
return 0;
|
|
}
|