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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
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.
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "includes.h"
#include "utils/net/net.h"
#include "libnet/libnet.h"
-#include "librpc/gen_ndr/ndr_samr.h"
+#include "libcli/security/security.h"
+#include "param/param.h"
int net_join(struct net_context *ctx, int argc, const char **argv)
{
} 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"));
+ d_fprintf(stderr, "net_join: Invalid 2nd argument (%s) must be MEMBER or BDC\n", argv[1]);
return net_join_usage(ctx, argc, argv);
}
break;
if (!r) {
return -1;
}
- /* prepare password change */
+ /* prepare parameters for the join */
r->in.netbios_name = lp_netbios_name();
r->in.domain_name = domain_name;
- r->in.secure_channel_type = secure_channel_type;
+ r->in.join_type = secure_channel_type;
r->in.level = LIBNET_JOIN_AUTOMATIC;
r->out.error_string = NULL;
status = libnet_Join(libnetctx, r, r);
if (!NT_STATUS_IS_OK(status)) {
- d_printf("Joining domain failed: %s\n",
- r->out.error_string ? r->out.error_string : nt_errstr(status));
+ d_fprintf(stderr, "Joining domain failed: %s\n",
+ r->out.error_string ? r->out.error_string : nt_errstr(status));
talloc_free(r);
talloc_free(libnetctx);
return -1;
}
+ d_printf("Joined domain %s (%s)\n", r->out.domain_name, dom_sid_string(ctx->mem_ctx, r->out.domain_sid));
+
talloc_free(libnetctx);
return 0;
}