summaryrefslogtreecommitdiffstats
path: root/source4/winbind/wb_server.h
diff options
context:
space:
mode:
authorVolker Lendecke <vlendec@samba.org>2005-11-05 23:46:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:45:49 -0500
commit69307693dc47cdaa931551c99914e85273037886 (patch)
tree538173f824d7e93fc740ccea105f61196a070859 /source4/winbind/wb_server.h
parentf792c4f8f23793b2a99d2cb6beff12bbe4044151 (diff)
downloadsamba-69307693dc47cdaa931551c99914e85273037886.tar.gz
samba-69307693dc47cdaa931551c99914e85273037886.tar.xz
samba-69307693dc47cdaa931551c99914e85273037886.zip
r11528: Separate finding dcs from initializing a domain. Makes it easier to possibly
support cldap and other stuff in the future. This temporarily disables wbinfo -t, but that will come back soon. Try an ldap bind using gss-spnego. This got me krb5 binds against "our" w2k3 and a trusted w2k, although with some memleaks from krb5 and a BAD_OPTION tgs-rep error. Volker (This used to be commit d14948fdf687c8f70ef9ec35445b7eb04da84253)
Diffstat (limited to 'source4/winbind/wb_server.h')
-rw-r--r--source4/winbind/wb_server.h22
1 files changed, 11 insertions, 11 deletions
diff --git a/source4/winbind/wb_server.h b/source4/winbind/wb_server.h
index 0407d89371c..09afffb0c9a 100644
--- a/source4/winbind/wb_server.h
+++ b/source4/winbind/wb_server.h
@@ -45,16 +45,20 @@ struct wbsrv_samconn {
NTSTATUS (*seqnum_recv)(struct composite_context *, uint64_t *);
};
-struct wbsrv_domain {
- struct wbsrv_domain *next, *prev;
-
- BOOL initialized;
-
+struct wb_dom_info {
const char *name;
+ const char *dns_name;
const struct dom_sid *sid;
- const char *dcname;
- const char *dc_dnsname;
+
+ const char *dc_name;
+ const char *dc_dns_name;
const char *dc_address;
+};
+
+struct wbsrv_domain {
+ struct wbsrv_domain *next, *prev;
+
+ struct wb_dom_info *info;
struct dcerpc_pipe *lsa_pipe;
struct policy_handle *lsa_policy;
@@ -66,12 +70,8 @@ struct wbsrv_domain {
struct ldap_connection *ldap_conn;
- struct dcerpc_pipe *netlogon_auth2_pipe;
struct dcerpc_pipe *netlogon_pipe;
struct cli_credentials *schannel_creds;
-
- BOOL busy;
- struct domain_request_state *request_queue;
};
/*