mirror of
https://github.com/samba-team/samba.git
synced 2025-10-26 23:33:15 +03:00
r10486: This is a merge of Brad Henry's 'net join' rework, to better perform
an ADS join, particularly as a DC. This represents the bulk of his Google SOC work, and I'm very pleased to intergrate it into the tree. (Metze will intergrate the DRSUAPI work later). Both metze and myself have also put a lot of time into this patch, and in mentoring Brad in general. In return, Brad has been a very good student, and has taken the comments well. Since it's last appearance on samba-technical@, I have made correctness and valgrind fixups, as well as adding a new 'BINDING' mode to the libnet_rpc routines. This allows the exact binding string to be passed down from the torture code, including options and exact target host. Andrew Bartlett
This commit is contained in:
committed by
Gerald (Jerry) Carter
parent
9456ed3db3
commit
d6fa105fda
@@ -3,6 +3,7 @@
|
||||
|
||||
Copyright (C) Stefan Metzmacher 2004
|
||||
Copyright (C) Andrew Bartlett <abartlet@samba.org> 2005
|
||||
Copyright (C) Brad Henry 2005
|
||||
|
||||
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
|
||||
@@ -21,10 +22,23 @@
|
||||
|
||||
#include "librpc/gen_ndr/ndr_netlogon.h"
|
||||
|
||||
enum libnet_Join_level {
|
||||
LIBNET_JOIN_AUTOMATIC,
|
||||
LIBNET_JOIN_SPECIFIED,
|
||||
};
|
||||
|
||||
enum libnet_JoinDomain_level {
|
||||
LIBNET_JOINDOMAIN_AUTOMATIC,
|
||||
LIBNET_JOINDOMAIN_SPECIFIED,
|
||||
};
|
||||
|
||||
struct libnet_JoinDomain {
|
||||
struct {
|
||||
const char *domain_name;
|
||||
const char *account_name;
|
||||
const char *netbios_name;
|
||||
const char *binding;
|
||||
enum libnet_JoinDomain_level level;
|
||||
uint32_t acct_type;
|
||||
} in;
|
||||
|
||||
@@ -34,18 +48,30 @@ struct libnet_JoinDomain {
|
||||
struct dom_sid *domain_sid;
|
||||
const char *domain_name;
|
||||
const char *realm;
|
||||
unsigned int kvno;
|
||||
const char *domain_dn_str;
|
||||
const char *account_dn_str;
|
||||
const char *server_dn_str;
|
||||
uint32_t kvno; /* msDS-KeyVersionNumber */
|
||||
struct dcerpc_pipe *lsa_pipe;
|
||||
struct dcerpc_pipe *samr_pipe;
|
||||
struct dcerpc_binding *samr_binding;
|
||||
struct policy_handle *user_handle;
|
||||
struct dom_sid *account_sid;
|
||||
} out;
|
||||
};
|
||||
|
||||
struct libnet_Join {
|
||||
struct {
|
||||
const char *domain_name;
|
||||
const char *netbios_name;
|
||||
enum netr_SchannelType secure_channel_type;
|
||||
enum libnet_Join_level level;
|
||||
} in;
|
||||
|
||||
struct {
|
||||
const char *error_string;
|
||||
const char *join_password;
|
||||
struct dom_sid *domain_sid;
|
||||
} out;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user