diff options
author | Andrew Bartlett <abartlet@samba.org> | 2005-05-01 19:29:00 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:16:26 -0500 |
commit | 85e9412c4786ede6f94d879185d493756d37eebe (patch) | |
tree | bb1f38e33db38af59f427228402cec1095bf4793 /source4/include | |
parent | 7fca1d46cea38229faf9a7092d86a452658f2ca0 (diff) | |
download | samba-85e9412c4786ede6f94d879185d493756d37eebe.tar.gz samba-85e9412c4786ede6f94d879185d493756d37eebe.tar.bz2 samba-85e9412c4786ede6f94d879185d493756d37eebe.zip |
r6565: Cludge, cludge, cludge...
We need to pass the 'secure channel type' to the NETLOGON layer, which
must match the account type.
(Yes, jelmer objects to this inclusion of the kitchen sink ;-)
Andrew Bartlett
(This used to be commit 8ee208a926d2b15fdc42753b1f9ee586564c6248)
Diffstat (limited to 'source4/include')
-rw-r--r-- | source4/include/credentials.h | 1 | ||||
-rw-r--r-- | source4/include/includes.h | 2 | ||||
-rw-r--r-- | source4/include/structs.h | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/source4/include/credentials.h b/source4/include/credentials.h index e7df58f217..309fff056e 100644 --- a/source4/include/credentials.h +++ b/source4/include/credentials.h @@ -55,6 +55,7 @@ struct cli_credentials { void *priv_data; struct creds_CredentialState *netlogon_creds; + enum netr_SchannelType secure_channel_type; /* We are flagged to get machine account details from the * secrets.ldb when we are asked for a username or password */ diff --git a/source4/include/includes.h b/source4/include/includes.h index ce78e14d7d..65cbd1b777 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -123,7 +123,6 @@ extern int errno; #include "smb.h" #include "byteorder.h" #include "module.h" -#include "credentials.h" #include "librpc/ndr/libndr.h" #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/gen_ndr/ndr_dcerpc.h" @@ -134,6 +133,7 @@ extern int errno; #include "ntvfs/ntvfs.h" #include "cli_context.h" #include "lib/com/com.h" +#include "credentials.h" #define malloc_p(type) (type *)malloc(sizeof(type)) #define malloc_array_p(type, count) (type *)realloc_array(NULL, sizeof(type), count) diff --git a/source4/include/structs.h b/source4/include/structs.h index 80a1df8383..4e29ef8d50 100644 --- a/source4/include/structs.h +++ b/source4/include/structs.h @@ -201,4 +201,3 @@ struct wrepl_pull_table; struct wrepl_pull_names; struct arcfour_state; - |