From 78c50015bb8bd5a1d831a6e7ec796b3367c73145 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 3 Jan 2006 15:40:05 +0000 Subject: r12694: Move some headers to the directory of the subsystem they belong to. (This used to be commit c722f665c90103f3ed57621c460e32ad33e7a8a3) --- source4/auth/credentials/credentials_files.c | 2 +- source4/auth/gensec/spnego_parse.c | 2 +- source4/auth/kerberos/gssapi_parse.c | 2 +- source4/auth/ntlmssp/ntlmssp_parse.c | 1 + source4/client/client.c | 2 +- source4/include/asn_1.h | 53 --------------------- source4/include/charset.h | 57 ----------------------- source4/include/cli_context.h | 32 ------------- source4/include/clilist.h | 28 ----------- source4/include/db_wrap.h | 30 ------------ source4/include/enums.h | 8 ++++ source4/include/includes.h | 4 +- source4/include/messages.h | 35 -------------- source4/include/secrets.h | 67 --------------------------- source4/include/smb.h | 23 +++------- source4/include/smb_macros.h | 6 --- source4/include/structs.h | 3 ++ source4/ldap_server/ldap_server.c | 2 +- source4/lib/charset/charset.h | 69 ++++++++++++++++++++++++++++ source4/lib/charset/config.mk | 1 + source4/lib/db_wrap.h | 30 ++++++++++++ source4/lib/messaging/messaging.c | 2 +- source4/lib/messaging/messaging.h | 35 ++++++++++++++ source4/lib/stream/packet.c | 1 + source4/lib/util_str.c | 1 + source4/libcli/auth/smbencrypt.c | 1 + source4/libcli/cldap/cldap.h | 2 +- source4/libcli/cliconnect.c | 1 + source4/libcli/clideltree.c | 3 +- source4/libcli/clilist.c | 2 +- source4/libcli/config.mk | 1 + source4/libcli/ldap/ldap.c | 2 +- source4/libcli/ldap/ldap_client.c | 2 +- source4/libcli/libcli.h | 45 ++++++++++++++++++ source4/libcli/raw/libcliraw.h | 1 + source4/libcli/raw/rawfile.c | 1 + source4/libcli/raw/smb_signing.c | 1 + source4/libcli/smb2/smb2.h | 2 + source4/libcli/util/asn1.c | 2 +- source4/libcli/util/asn_1.h | 53 +++++++++++++++++++++ source4/libcli/util/clilsa.c | 1 + source4/libnet/libnet_join.c | 2 +- source4/libnet/libnet_passwd.c | 1 + source4/main.mk | 4 +- source4/ntvfs/common/brlock.c | 2 +- source4/ntvfs/common/opendb.c | 3 +- source4/ntvfs/posix/pvfs_lock.c | 2 +- source4/ntvfs/posix/pvfs_open.c | 2 +- source4/ntvfs/simple/svfs_util.c | 1 + source4/param/loadparm.c | 1 + source4/passdb/secrets.h | 67 +++++++++++++++++++++++++++ source4/scripting/ejs/smbcalls_cli.c | 2 +- source4/smb_server/smb_server.h | 1 + source4/torture/basic/aliases.c | 1 + source4/torture/basic/attr.c | 1 + source4/torture/basic/charset.c | 1 + source4/torture/basic/delaywrite.c | 1 + source4/torture/basic/delete.c | 1 + source4/torture/basic/denytest.c | 1 + source4/torture/basic/dir.c | 1 + source4/torture/basic/disconnect.c | 1 + source4/torture/basic/locking.c | 1 + source4/torture/basic/mangle_test.c | 1 + source4/torture/basic/properties.c | 1 + source4/torture/basic/rename.c | 1 + source4/torture/basic/scanner.c | 1 + source4/torture/basic/secleak.c | 1 + source4/torture/basic/unlink.c | 1 + source4/torture/basic/utable.c | 1 + source4/torture/gentest.c | 1 + source4/torture/locktest.c | 1 + source4/torture/masktest.c | 2 +- source4/torture/nbench/nbench.c | 1 + source4/torture/nbench/nbio.c | 1 + source4/torture/rap/rap.c | 1 + source4/torture/raw/acls.c | 1 + source4/torture/raw/chkpath.c | 1 + source4/torture/raw/close.c | 1 + source4/torture/raw/composite.c | 1 + source4/torture/raw/context.c | 1 + source4/torture/raw/eas.c | 1 + source4/torture/raw/ioctl.c | 1 + source4/torture/raw/lock.c | 1 + source4/torture/raw/mkdir.c | 1 + source4/torture/raw/mux.c | 1 + source4/torture/raw/notify.c | 1 + source4/torture/raw/open.c | 1 + source4/torture/raw/oplock.c | 1 + source4/torture/raw/qfileinfo.c | 1 + source4/torture/raw/qfsinfo.c | 1 + source4/torture/raw/read.c | 1 + source4/torture/raw/rename.c | 1 + source4/torture/raw/search.c | 1 + source4/torture/raw/seek.c | 1 + source4/torture/raw/setfileinfo.c | 1 + source4/torture/raw/streams.c | 1 + source4/torture/raw/unlink.c | 1 + source4/torture/raw/write.c | 1 + source4/torture/rpc/netlogon.c | 1 + source4/torture/rpc/samr.c | 1 + source4/torture/rpc/testjoin.c | 1 + source4/torture/smb2/connect.c | 1 + source4/torture/torture.c | 1 + source4/torture/torture_util.c | 1 + 104 files changed, 408 insertions(+), 348 deletions(-) delete mode 100644 source4/include/asn_1.h delete mode 100644 source4/include/charset.h delete mode 100644 source4/include/cli_context.h delete mode 100644 source4/include/clilist.h delete mode 100644 source4/include/db_wrap.h delete mode 100644 source4/include/messages.h delete mode 100644 source4/include/secrets.h create mode 100644 source4/lib/charset/charset.h create mode 100644 source4/lib/db_wrap.h create mode 100644 source4/lib/messaging/messaging.h create mode 100644 source4/libcli/libcli.h create mode 100644 source4/libcli/util/asn_1.h create mode 100644 source4/passdb/secrets.h diff --git a/source4/auth/credentials/credentials_files.c b/source4/auth/credentials/credentials_files.c index 8d84e8cdb5..219869cf3a 100644 --- a/source4/auth/credentials/credentials_files.c +++ b/source4/auth/credentials/credentials_files.c @@ -25,7 +25,7 @@ #include "includes.h" #include "lib/ldb/include/ldb.h" #include "librpc/gen_ndr/ndr_samr.h" /* for struct samrPassword */ -#include "include/secrets.h" +#include "passdb/secrets.h" #include "system/filesys.h" /** diff --git a/source4/auth/gensec/spnego_parse.c b/source4/auth/gensec/spnego_parse.c index 59b09b1969..8dde78da48 100644 --- a/source4/auth/gensec/spnego_parse.c +++ b/source4/auth/gensec/spnego_parse.c @@ -23,7 +23,7 @@ #include "includes.h" #include "auth/auth.h" -#include "asn_1.h" +#include "libcli/util/asn_1.h" static BOOL read_negTokenInit(struct asn1_data *asn1, struct spnego_negTokenInit *token) { diff --git a/source4/auth/kerberos/gssapi_parse.c b/source4/auth/kerberos/gssapi_parse.c index a48179cc1a..5226d77a2b 100644 --- a/source4/auth/kerberos/gssapi_parse.c +++ b/source4/auth/kerberos/gssapi_parse.c @@ -23,7 +23,7 @@ */ #include "includes.h" -#include "asn_1.h" +#include "libcli/util/asn_1.h" #include "auth/gensec/gensec.h" /* diff --git a/source4/auth/ntlmssp/ntlmssp_parse.c b/source4/auth/ntlmssp/ntlmssp_parse.c index 42546cb130..e8c08bf650 100644 --- a/source4/auth/ntlmssp/ntlmssp_parse.c +++ b/source4/auth/ntlmssp/ntlmssp_parse.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "smb.h" #include "pstring.h" /* diff --git a/source4/client/client.c b/source4/client/client.c index 712a5261fa..afaa313928 100644 --- a/source4/client/client.c +++ b/source4/client/client.c @@ -23,7 +23,7 @@ #include "includes.h" #include "version.h" -#include "clilist.h" +#include "libcli/libcli.h" #include "lib/cmdline/popt_common.h" #include "librpc/gen_ndr/ndr_srvsvc.h" #include "librpc/gen_ndr/ndr_lsa.h" diff --git a/source4/include/asn_1.h b/source4/include/asn_1.h deleted file mode 100644 index 2dc9bef06d..0000000000 --- a/source4/include/asn_1.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - Unix SMB/CIFS implementation. - simple ASN1 code - Copyright (C) Andrew Tridgell 2001 - - 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. -*/ - -#ifndef _ASN_1_H -#define _ASN_1_H - -struct nesting { - off_t start; - size_t taglen; /* for parsing */ - struct nesting *next; -}; - -struct asn1_data { - uint8_t *data; - size_t length; - off_t ofs; - struct nesting *nesting; - BOOL has_error; -}; - -#define ASN1_APPLICATION(x) ((x)+0x60) -#define ASN1_APPLICATION_SIMPLE(x) ((x)+0x40) -#define ASN1_SEQUENCE(x) ((x)+0x30) -#define ASN1_CONTEXT(x) ((x)+0xa0) -#define ASN1_CONTEXT_SIMPLE(x) ((x)+0x80) -#define ASN1_GENERAL_STRING 0x1b -#define ASN1_OCTET_STRING 0x4 -#define ASN1_OID 0x6 -#define ASN1_BOOLEAN 0x1 -#define ASN1_INTEGER 0x2 -#define ASN1_ENUMERATED 0xa -#define ASN1_SET 0x31 - -#define ASN1_MAX_OIDS 20 - -#endif /* _ASN_1_H */ diff --git a/source4/include/charset.h b/source4/include/charset.h deleted file mode 100644 index ba1402acb3..0000000000 --- a/source4/include/charset.h +++ /dev/null @@ -1,57 +0,0 @@ -/* - Unix SMB/CIFS implementation. - charset defines - Copyright (C) Andrew Tridgell 2001 - Copyright (C) Jelmer Vernooij 2002 - - 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. -*/ - -/* this defines the charset types used in samba */ -typedef enum {CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4, CH_UTF16BE=5} charset_t; - -#define NUM_CHARSETS 6 - -/* - * for each charset we have a function that pulls from that charset to - * a ucs2 buffer, and a function that pushes to a ucs2 buffer - * */ - -struct charset_functions { - const char *name; - size_t (*pull)(void *, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); - size_t (*push)(void *, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); - struct charset_functions *prev, *next; -}; - -/* this type is used for manipulating unicode codepoints */ -typedef uint32_t codepoint_t; - -#define INVALID_CODEPOINT ((codepoint_t)-1) - - -/* generic iconv conversion structure */ -typedef struct { - size_t (*direct)(void *cd, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); - size_t (*pull)(void *cd, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); - size_t (*push)(void *cd, const char **inbuf, size_t *inbytesleft, - char **outbuf, size_t *outbytesleft); - void *cd_direct, *cd_pull, *cd_push; -} *smb_iconv_t; - diff --git a/source4/include/cli_context.h b/source4/include/cli_context.h deleted file mode 100644 index 843e8e8ca9..0000000000 --- a/source4/include/cli_context.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB parameters and setup - Copyright (C) Andrew Tridgell 2004 - Copyright (C) James Myers 2003 - - 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. -*/ - -/* - smbcli_state: internal state used in libcli library for single-threaded callers, - i.e. a single session on a single socket. - */ -struct smbcli_state { - struct smbcli_transport *transport; - struct smbcli_session *session; - struct smbcli_tree *tree; - struct substitute_context *substitute; - struct smblsa_state *lsa; -}; diff --git a/source4/include/clilist.h b/source4/include/clilist.h deleted file mode 100644 index d031987768..0000000000 --- a/source4/include/clilist.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - Copyright (C) Andrew Tridgell 2004 - - 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. -*/ - -struct clilist_file_info { - uint64_t size; - uint16_t attrib; - time_t mtime; - const char *name; - const char *short_name; -}; - diff --git a/source4/include/db_wrap.h b/source4/include/db_wrap.h deleted file mode 100644 index 48e1bbc9e1..0000000000 --- a/source4/include/db_wrap.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - Unix SMB/CIFS implementation. - - database wrap headers - - Copyright (C) Andrew Tridgell 2004 - - 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. -*/ - - -struct tdb_wrap { - struct tdb_context *tdb; - - const char *name; - struct tdb_wrap *next, *prev; -}; - diff --git a/source4/include/enums.h b/source4/include/enums.h index 4e8e7b04a0..6003dfc7a0 100644 --- a/source4/include/enums.h +++ b/source4/include/enums.h @@ -28,3 +28,11 @@ enum protocol_types {PROTOCOL_NONE,PROTOCOL_CORE,PROTOCOL_COREPLUS,PROTOCOL_LANM /* security levels */ enum security_types {SEC_SHARE,SEC_USER}; + +/* passed to br lock code */ +enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK}; + +enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, + SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO}; + + diff --git a/source4/include/includes.h b/source4/include/includes.h index 849850daa6..dd4f19009a 100644 --- a/source4/include/includes.h +++ b/source4/include/includes.h @@ -84,9 +84,8 @@ struct ipv4_addr { #include "structs.h" #include "trans2.h" #include "nterr.h" +#include "charset/charset.h" #include "core.h" -#include "smb.h" -#include "charset.h" #include "debug.h" #include "doserr.h" #include "enums.h" @@ -98,7 +97,6 @@ struct ipv4_addr { #include "librpc/gen_ndr/orpc.h" #include "librpc/rpc/dcerpc.h" #include "smb_interfaces.h" -#include "cli_context.h" #include "auth/credentials/credentials.h" #include "libcli/nbt/libnbt.h" diff --git a/source4/include/messages.h b/source4/include/messages.h deleted file mode 100644 index dcb20d69b1..0000000000 --- a/source4/include/messages.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - Unix SMB/CIFS implementation. - messages.c header - Copyright (C) Andrew Tridgell 2000 - Copyright (C) 2001, 2002 by Martin Pool - - 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. -*/ - -#ifndef _MESSAGES_H_ -#define _MESSAGES_H_ - -struct messaging_context; - -/* general messages */ -#define MSG_DEBUG 1 -#define MSG_PING 2 -#define MSG_PONG 3 -#define MSG_BRL_RETRY 4 -#define MSG_PVFS_RETRY_OPEN 5 -#define MSG_IRPC 6 - -#endif diff --git a/source4/include/secrets.h b/source4/include/secrets.h deleted file mode 100644 index 429e955a8f..0000000000 --- a/source4/include/secrets.h +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Unix SMB/CIFS implementation. - * secrets.tdb file format info - * Copyright (C) Andrew Tridgell 2000 - * - * 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. - */ - -#ifndef _SECRETS_H -#define _SECRETS_H - -/* the first one is for the hashed password (NT4 style) the latter - for plaintext (ADS) -*/ -#define SECRETS_MACHINE_ACCT_PASS "SECRETS/$MACHINE.ACC" -#define SECRETS_MACHINE_PASSWORD "SECRETS/MACHINE_PASSWORD" - -/* this one is for storing trusted domain account password */ -#define SECRETS_DOMTRUST_ACCT_PASS "SECRETS/$DOMTRUST.ACC" - -/* Store the principal name used for Kerberos DES key salt under this key name. */ -#define SECRETS_SALTING_PRINCIPAL "SECRETS/SALTING_PRINCIPAL" - -/* The domain sid and our sid are stored here even though they aren't - really secret. */ -#define SECRETS_DOMAIN_SID "SECRETS/SID" -#define SECRETS_SAM_SID "SAM/SID" - -/* The domain GUID and server GUID (NOT the same) are also not secret */ -#define SECRETS_DOMAIN_GUID "SECRETS/DOMGUID" -#define SECRETS_SERVER_GUID "SECRETS/GUID" - -#define SECRETS_LDAP_BIND_PW "SECRETS/LDAP_BIND_PW" - -/* Authenticated user info is stored in secrets.tdb under these keys */ - -#define SECRETS_AUTH_USER "SECRETS/AUTH_USER" -#define SECRETS_AUTH_DOMAIN "SECRETS/AUTH_DOMAIN" -#define SECRETS_AUTH_PASSWORD "SECRETS/AUTH_PASSWORD" - -/* structure for storing machine account password - (ie. when samba server is member of a domain */ -struct machine_acct_pass { - uint8_t hash[16]; - time_t mod_time; -}; - -#define SECRETS_PRIMARY_DOMAIN_DN "cn=Primary Domains" -#define SECRETS_PRINCIPALS_DN "cn=Principals" -#define SECRETS_PRIMARY_DOMAIN_FILTER "(&(flatname=%s)(objectclass=primaryDomain))" -#define SECRETS_PRIMARY_REALM_FILTER "(&(realm=%s)(objectclass=primaryDomain))" -#define SECRETS_KRBTGT_SEARCH "(&((|(realm=%s)(flatname=%s))(samAccountName=krbtgt)))" -#define SECRETS_PRINCIPAL_SEARCH "(&(|(realm=%s)(flatname=%s))(servicePrincipalName=%s))" - -#endif /* _SECRETS_H */ diff --git a/source4/include/smb.h b/source4/include/smb.h index f7a46e757d..5297ef9e27 100644 --- a/source4/include/smb.h +++ b/source4/include/smb.h @@ -29,9 +29,6 @@ #define SMB_PORTS "445 139" -enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, - SMB_SIGNING_REQUIRED, SMB_SIGNING_AUTO}; - /* deny modes */ #define DENY_DOS 0 #define DENY_ALL 1 @@ -557,20 +554,6 @@ enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED, #define DEFAULT_TRUST_ACCOUNT_PASSWORD_LENGTH 14 -/* passed to br lock code */ -enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK}; - -/* string manipulation flags - see clistr.c and srvstr.c */ -#define STR_TERMINATE 1 -#define STR_UPPER 2 -#define STR_ASCII 4 -#define STR_UNICODE 8 -#define STR_NOALIGN 16 -#define STR_NO_RANGE_CHECK 32 -#define STR_LEN8BIT 64 -#define STR_TERMINATE_ASCII 128 /* only terminate if ascii */ -#define STR_LEN_NOTERM 256 /* the length field is the unterminated length */ - /* filesystem attribute bits @@ -590,4 +573,10 @@ enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK}; #define FS_ATTR_ENCRYPTION 0x00020000 #define FS_ATTR_NAMED_STREAMS 0x00040000 +#define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16)) +#define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \ + (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0) +#define _smb_setlen2(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \ + (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0) + #endif /* _SMB_H */ diff --git a/source4/include/smb_macros.h b/source4/include/smb_macros.h index afe31e00ba..356d968083 100644 --- a/source4/include/smb_macros.h +++ b/source4/include/smb_macros.h @@ -44,12 +44,6 @@ DEBUG(0,("PANIC: assert failed at %s(%d)\n", __FILE__, __LINE__)); \ smb_panic("assert failed"); }} while (0) -#define smb_len(buf) (PVAL(buf,3)|(PVAL(buf,2)<<8)|(PVAL(buf,1)<<16)) -#define _smb_setlen(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0x10000)>>16; \ - (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0) -#define _smb_setlen2(buf,len) do {(buf)[0] = 0; (buf)[1] = ((len)&0xFF0000)>>16; \ - (buf)[2] = ((len)&0xFF00)>>8; (buf)[3] = (len)&0xFF;} while (0) - #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) #endif diff --git a/source4/include/structs.h b/source4/include/structs.h index b78d918417..83f742b30e 100644 --- a/source4/include/structs.h +++ b/source4/include/structs.h @@ -372,3 +372,6 @@ struct registry_context; struct nbtd_interface; struct nbtd_iface_name; struct nbtd_server; +struct smbcli_session; +struct smbcli_state; +struct substitute_context; diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c index 26bb2402e8..d573652143 100644 --- a/source4/ldap_server/ldap_server.c +++ b/source4/ldap_server/ldap_server.c @@ -26,7 +26,7 @@ #include "lib/events/events.h" #include "auth/auth.h" #include "dlinklist.h" -#include "asn_1.h" +#include "libcli/util/asn_1.h" #include "ldap_server/ldap_server.h" #include "smbd/service_task.h" #include "smbd/service_stream.h" diff --git a/source4/lib/charset/charset.h b/source4/lib/charset/charset.h new file mode 100644 index 0000000000..5ad2f431bf --- /dev/null +++ b/source4/lib/charset/charset.h @@ -0,0 +1,69 @@ +/* + Unix SMB/CIFS implementation. + charset defines + Copyright (C) Andrew Tridgell 2001 + Copyright (C) Jelmer Vernooij 2002 + + 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. +*/ + +/* this defines the charset types used in samba */ +typedef enum {CH_UTF16=0, CH_UNIX=1, CH_DISPLAY=2, CH_DOS=3, CH_UTF8=4, CH_UTF16BE=5} charset_t; + +#define NUM_CHARSETS 6 + +/* + * for each charset we have a function that pulls from that charset to + * a ucs2 buffer, and a function that pushes to a ucs2 buffer + * */ + +struct charset_functions { + const char *name; + size_t (*pull)(void *, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + size_t (*push)(void *, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + struct charset_functions *prev, *next; +}; + +/* this type is used for manipulating unicode codepoints */ +typedef uint32_t codepoint_t; + +#define INVALID_CODEPOINT ((codepoint_t)-1) + + +/* generic iconv conversion structure */ +typedef struct { + size_t (*direct)(void *cd, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + size_t (*pull)(void *cd, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + size_t (*push)(void *cd, const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft); + void *cd_direct, *cd_pull, *cd_push; +} *smb_iconv_t; + +/* string manipulation flags */ +#define STR_TERMINATE 1 +#define STR_UPPER 2 +#define STR_ASCII 4 +#define STR_UNICODE 8 +#define STR_NOALIGN 16 +#define STR_NO_RANGE_CHECK 32 +#define STR_LEN8BIT 64 +#define STR_TERMINATE_ASCII 128 /* only terminate if ascii */ +#define STR_LEN_NOTERM 256 /* the length field is the unterminated length */ + +#include "lib/charset/charset_proto.h" diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk index 4fb8ee79bf..a69bee1ec3 100644 --- a/source4/lib/charset/config.mk +++ b/source4/lib/charset/config.mk @@ -4,6 +4,7 @@ OBJ_FILES = \ iconv.o \ charcnv.o +PRIVATE_PROTO_HEADER = charset_proto.h REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV # End SUBSYSTEM CHARSET ################################################ diff --git a/source4/lib/db_wrap.h b/source4/lib/db_wrap.h new file mode 100644 index 0000000000..48e1bbc9e1 --- /dev/null +++ b/source4/lib/db_wrap.h @@ -0,0 +1,30 @@ +/* + Unix SMB/CIFS implementation. + + database wrap headers + + Copyright (C) Andrew Tridgell 2004 + + 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. +*/ + + +struct tdb_wrap { + struct tdb_context *tdb; + + const char *name; + struct tdb_wrap *next, *prev; +}; + diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c index c7cce9c133..ea345ff881 100644 --- a/source4/lib/messaging/messaging.c +++ b/source4/lib/messaging/messaging.c @@ -23,7 +23,7 @@ #include "includes.h" #include "lib/events/events.h" #include "system/filesys.h" -#include "messages.h" +#include "messaging/messaging.h" #include "dlinklist.h" #include "lib/socket/socket.h" #include "librpc/gen_ndr/ndr_irpc.h" diff --git a/source4/lib/messaging/messaging.h b/source4/lib/messaging/messaging.h new file mode 100644 index 0000000000..dcb20d69b1 --- /dev/null +++ b/source4/lib/messaging/messaging.h @@ -0,0 +1,35 @@ +/* + Unix SMB/CIFS implementation. + messages.c header + Copyright (C) Andrew Tridgell 2000 + Copyright (C) 2001, 2002 by Martin Pool + + 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. +*/ + +#ifndef _MESSAGES_H_ +#define _MESSAGES_H_ + +struct messaging_context; + +/* general messages */ +#define MSG_DEBUG 1 +#define MSG_PING 2 +#define MSG_PONG 3 +#define MSG_BRL_RETRY 4 +#define MSG_PVFS_RETRY_OPEN 5 +#define MSG_IRPC 6 + +#endif diff --git a/source4/lib/stream/packet.c b/source4/lib/stream/packet.c index d8ce332de6..2c053009dd 100644 --- a/source4/lib/stream/packet.c +++ b/source4/lib/stream/packet.c @@ -22,6 +22,7 @@ */ #include "includes.h" +#include "smb.h" #include "dlinklist.h" #include "lib/events/events.h" #include "lib/socket/socket.h" diff --git a/source4/lib/util_str.c b/source4/lib/util_str.c index 56a1345e38..17c0924d68 100644 --- a/source4/lib/util_str.c +++ b/source4/lib/util_str.c @@ -23,6 +23,7 @@ #include "includes.h" #include "system/iconv.h" +#include "smb.h" #include "pstring.h" #include "lib/ldb/include/ldb.h" diff --git a/source4/libcli/auth/smbencrypt.c b/source4/libcli/auth/smbencrypt.c index b031bf4886..6bc9de2f2b 100644 --- a/source4/libcli/auth/smbencrypt.c +++ b/source4/libcli/auth/smbencrypt.c @@ -24,6 +24,7 @@ #include "includes.h" #include "system/time.h" +#include "smb.h" #include "auth/ntlmssp/ntlmssp.h" #include "lib/crypto/crypto.h" #include "pstring.h" diff --git a/source4/libcli/cldap/cldap.h b/source4/libcli/cldap/cldap.h index 632dbd1f65..e1f59464e5 100644 --- a/source4/libcli/cldap/cldap.h +++ b/source4/libcli/cldap/cldap.h @@ -20,7 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#include "asn_1.h" +#include "libcli/util/asn_1.h" #include "librpc/gen_ndr/ndr_nbt.h" enum cldap_request_state {CLDAP_REQUEST_SEND, diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c index 220b5a3898..fe0ad9c9f5 100644 --- a/source4/libcli/cliconnect.c +++ b/source4/libcli/cliconnect.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "libcli/libcli.h" #include "libcli/raw/libcliraw.h" #include "libcli/smb_composite/smb_composite.h" diff --git a/source4/libcli/clideltree.c b/source4/libcli/clideltree.c index 30369b977f..0c65d993c8 100644 --- a/source4/libcli/clideltree.c +++ b/source4/libcli/clideltree.c @@ -19,7 +19,8 @@ */ #include "includes.h" -#include "clilist.h" +#include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" struct delete_state { struct smbcli_tree *tree; diff --git a/source4/libcli/clilist.c b/source4/libcli/clilist.c index 0d69a386eb..f18ec84db9 100644 --- a/source4/libcli/clilist.c +++ b/source4/libcli/clilist.c @@ -20,7 +20,7 @@ */ #include "includes.h" -#include "clilist.h" +#include "libcli/libcli.h" #include "libcli/raw/libcliraw.h" struct search_private { diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index fb04c32d85..20219be0f4 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -98,6 +98,7 @@ REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \ [SUBSYSTEM::LIBSMB] REQUIRED_SUBSYSTEMS = LIBCLI SOCKET +PRIVATE_PROTO_HEADER = libcli_proto.h OBJ_FILES = clireadwrite.o \ cliconnect.o \ clifile.o \ diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c index 3cfbe3a1e1..c699820cea 100644 --- a/source4/libcli/ldap/ldap.c +++ b/source4/libcli/ldap/ldap.c @@ -25,7 +25,7 @@ #include "includes.h" #include "system/iconv.h" -#include "asn_1.h" +#include "libcli/util/asn_1.h" #include "libcli/ldap/ldap.h" diff --git a/source4/libcli/ldap/ldap_client.c b/source4/libcli/ldap/ldap_client.c index 77fc7db049..9b1a4ef9d5 100644 --- a/source4/libcli/ldap/ldap_client.c +++ b/source4/libcli/ldap/ldap_client.c @@ -24,7 +24,7 @@ */ #include "includes.h" -#include "asn_1.h" +#include "libcli/util/asn_1.h" #include "dlinklist.h" #include "lib/events/events.h" #include "lib/socket/socket.h" diff --git a/source4/libcli/libcli.h b/source4/libcli/libcli.h new file mode 100644 index 0000000000..917ab27519 --- /dev/null +++ b/source4/libcli/libcli.h @@ -0,0 +1,45 @@ +/* + Unix SMB/CIFS implementation. + SMB parameters and setup + Copyright (C) Andrew Tridgell 2004 + Copyright (C) James Myers 2003 + + 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 "smb.h" + +/* + smbcli_state: internal state used in libcli library for single-threaded callers, + i.e. a single session on a single socket. + */ +struct smbcli_state { + struct smbcli_transport *transport; + struct smbcli_session *session; + struct smbcli_tree *tree; + struct substitute_context *substitute; + struct smblsa_state *lsa; +}; + +struct clilist_file_info { + uint64_t size; + uint16_t attrib; + time_t mtime; + const char *name; + const char *short_name; +}; + + +#include "libcli/libcli_proto.h" diff --git a/source4/libcli/raw/libcliraw.h b/source4/libcli/raw/libcliraw.h index b09361b5ff..7eb0694bd2 100644 --- a/source4/libcli/raw/libcliraw.h +++ b/source4/libcli/raw/libcliraw.h @@ -21,6 +21,7 @@ */ #include "request.h" +#include "smb.h" #include "librpc/gen_ndr/ndr_nbt.h" struct smbcli_tree; /* forward declare */ diff --git a/source4/libcli/raw/rawfile.c b/source4/libcli/raw/rawfile.c index 6981a76800..0cc7385cee 100644 --- a/source4/libcli/raw/rawfile.c +++ b/source4/libcli/raw/rawfile.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "smb.h" #include "libcli/raw/libcliraw.h" #define SETUP_REQUEST(cmd, wct, buflen) do { \ diff --git a/source4/libcli/raw/smb_signing.c b/source4/libcli/raw/smb_signing.c index df63c33cb9..a73db78f7b 100644 --- a/source4/libcli/raw/smb_signing.c +++ b/source4/libcli/raw/smb_signing.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "smb.h" #include "libcli/raw/libcliraw.h" #include "lib/crypto/crypto.h" diff --git a/source4/libcli/smb2/smb2.h b/source4/libcli/smb2/smb2.h index eb7c10ed9d..cf84f34442 100644 --- a/source4/libcli/smb2/smb2.h +++ b/source4/libcli/smb2/smb2.h @@ -20,6 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "smb.h" + struct smb2_options { uint32_t timeout; }; diff --git a/source4/libcli/util/asn1.c b/source4/libcli/util/asn1.c index 0dceb1bba6..db3f7823fa 100644 --- a/source4/libcli/util/asn1.c +++ b/source4/libcli/util/asn1.c @@ -19,7 +19,7 @@ */ #include "includes.h" -#include "asn_1.h" +#include "libcli/util/asn_1.h" /* free an asn1 structure */ void asn1_free(struct asn1_data *data) diff --git a/source4/libcli/util/asn_1.h b/source4/libcli/util/asn_1.h new file mode 100644 index 0000000000..2dc9bef06d --- /dev/null +++ b/source4/libcli/util/asn_1.h @@ -0,0 +1,53 @@ +/* + Unix SMB/CIFS implementation. + simple ASN1 code + Copyright (C) Andrew Tridgell 2001 + + 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. +*/ + +#ifndef _ASN_1_H +#define _ASN_1_H + +struct nesting { + off_t start; + size_t taglen; /* for parsing */ + struct nesting *next; +}; + +struct asn1_data { + uint8_t *data; + size_t length; + off_t ofs; + struct nesting *nesting; + BOOL has_error; +}; + +#define ASN1_APPLICATION(x) ((x)+0x60) +#define ASN1_APPLICATION_SIMPLE(x) ((x)+0x40) +#define ASN1_SEQUENCE(x) ((x)+0x30) +#define ASN1_CONTEXT(x) ((x)+0xa0) +#define ASN1_CONTEXT_SIMPLE(x) ((x)+0x80) +#define ASN1_GENERAL_STRING 0x1b +#define ASN1_OCTET_STRING 0x4 +#define ASN1_OID 0x6 +#define ASN1_BOOLEAN 0x1 +#define ASN1_INTEGER 0x2 +#define ASN1_ENUMERATED 0xa +#define ASN1_SET 0x31 + +#define ASN1_MAX_OIDS 20 + +#endif /* _ASN_1_H */ diff --git a/source4/libcli/util/clilsa.c b/source4/libcli/util/clilsa.c index 3c7850b7fd..bf5048b02a 100644 --- a/source4/libcli/util/clilsa.c +++ b/source4/libcli/util/clilsa.c @@ -28,6 +28,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #include "librpc/gen_ndr/ndr_lsa.h" struct smblsa_state { diff --git a/source4/libnet/libnet_join.c b/source4/libnet/libnet_join.c index a1aa00c5c2..4f566a36a8 100644 --- a/source4/libnet/libnet_join.c +++ b/source4/libnet/libnet_join.c @@ -26,7 +26,7 @@ #include "lib/ldb/include/ldb.h" #include "lib/ldb/include/ldb_errors.h" #include "libcli/cldap/cldap.h" -#include "include/secrets.h" +#include "passdb/secrets.h" #include "dsdb/samdb/samdb.h" /* diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c index ec97eea838..bd09e306ce 100644 --- a/source4/libnet/libnet_passwd.c +++ b/source4/libnet/libnet_passwd.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "smb.h" #include "libnet/libnet.h" #include "lib/crypto/crypto.h" diff --git a/source4/main.mk b/source4/main.mk index a600df1a0b..018ab0ebbb 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -215,6 +215,7 @@ librpc/ndr/libndr.h: librpc/ndr/libndr_proto.h librpc/gen_ndr/misc.h librpc/rpc/dcerpc.h: librpc/rpc/dcerpc_proto.h auth/credentials/credentials.h: auth/credentials/credentials_proto.h libcli/nbt/libnbt.h: libcli/nbt/nbt_proto.h +lib/charset/charset.h: lib/charset/charset_proto.h include/includes.h: \ include/config.h \ @@ -223,7 +224,8 @@ include/includes.h: \ librpc/rpc/dcerpc.h \ auth/credentials/credentials_proto.h \ libcli/nbt/libnbt.h \ - lib/basic.h + lib/basic.h \ + lib/charset/charset.h clean_pch: -rm -f include/includes.h.gch diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c index e06cb0602e..3fc3c09316 100644 --- a/source4/ntvfs/common/brlock.c +++ b/source4/ntvfs/common/brlock.c @@ -28,7 +28,7 @@ #include "includes.h" #include "system/filesys.h" #include "lib/tdb/include/tdb.h" -#include "messages.h" +#include "messaging/messaging.h" #include "db_wrap.h" #include "lib/messaging/irpc.h" diff --git a/source4/ntvfs/common/opendb.c b/source4/ntvfs/common/opendb.c index 72e9fff1c6..7d45f38840 100644 --- a/source4/ntvfs/common/opendb.c +++ b/source4/ntvfs/common/opendb.c @@ -41,9 +41,10 @@ #include "includes.h" #include "system/filesys.h" #include "lib/tdb/include/tdb.h" -#include "messages.h" +#include "messaging/messaging.h" #include "librpc/gen_ndr/ndr_security.h" #include "db_wrap.h" +#include "smb_server/smb_server.h" #include "lib/messaging/irpc.h" struct odb_context { diff --git a/source4/ntvfs/posix/pvfs_lock.c b/source4/ntvfs/posix/pvfs_lock.c index a0832723b6..5031e4cef7 100644 --- a/source4/ntvfs/posix/pvfs_lock.c +++ b/source4/ntvfs/posix/pvfs_lock.c @@ -24,7 +24,7 @@ #include "vfs_posix.h" #include "system/time.h" #include "dlinklist.h" -#include "messages.h" +#include "messaging/messaging.h" /* diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c index 0e2a85bab1..5aeb5eb7e8 100644 --- a/source4/ntvfs/posix/pvfs_open.c +++ b/source4/ntvfs/posix/pvfs_open.c @@ -25,7 +25,7 @@ #include "system/dir.h" #include "system/time.h" #include "dlinklist.h" -#include "messages.h" +#include "messaging/messaging.h" #include "librpc/gen_ndr/ndr_xattr.h" /* diff --git a/source4/ntvfs/simple/svfs_util.c b/source4/ntvfs/simple/svfs_util.c index d332abb091..ab1eccc551 100644 --- a/source4/ntvfs/simple/svfs_util.c +++ b/source4/ntvfs/simple/svfs_util.c @@ -28,6 +28,7 @@ #include "svfs.h" #include "system/time.h" #include "system/dir.h" +#include "smb_server/smb_server.h" #include "ntvfs/ntvfs.h" /* diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c index 72eb1d83cd..08abc3aa48 100644 --- a/source4/param/loadparm.c +++ b/source4/param/loadparm.c @@ -53,6 +53,7 @@ */ #include "includes.h" +#include "smb.h" #include "version.h" #include "dynconfig.h" #include "pstring.h" diff --git a/source4/passdb/secrets.h b/source4/passdb/secrets.h new file mode 100644 index 0000000000..429e955a8f --- /dev/null +++ b/source4/passdb/secrets.h @@ -0,0 +1,67 @@ +/* + * Unix SMB/CIFS implementation. + * secrets.tdb file format info + * Copyright (C) Andrew Tridgell 2000 + * + * 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. + */ + +#ifndef _SECRETS_H +#define _SECRETS_H + +/* the first one is for the hashed password (NT4 style) the latter + for plaintext (ADS) +*/ +#define SECRETS_MACHINE_ACCT_PASS "SECRETS/$MACHINE.ACC" +#define SECRETS_MACHINE_PASSWORD "SECRETS/MACHINE_PASSWORD" + +/* this one is for storing trusted domain account password */ +#define SECRETS_DOMTRUST_ACCT_PASS "SECRETS/$DOMTRUST.ACC" + +/* Store the principal name used for Kerberos DES key salt under this key name. */ +#define SECRETS_SALTING_PRINCIPAL "SECRETS/SALTING_PRINCIPAL" + +/* The domain sid and our sid are stored here even though they aren't + really secret. */ +#define SECRETS_DOMAIN_SID "SECRETS/SID" +#define SECRETS_SAM_SID "SAM/SID" + +/* The domain GUID and server GUID (NOT the same) are also not secret */ +#define SECRETS_DOMAIN_GUID "SECRETS/DOMGUID" +#define SECRETS_SERVER_GUID "SECRETS/GUID" + +#define SECRETS_LDAP_BIND_PW "SECRETS/LDAP_BIND_PW" + +/* Authenticated user info is stored in secrets.tdb under these keys */ + +#define SECRETS_AUTH_USER "SECRETS/AUTH_USER" +#define SECRETS_AUTH_DOMAIN "SECRETS/AUTH_DOMAIN" +#define SECRETS_AUTH_PASSWORD "SECRETS/AUTH_PASSWORD" + +/* structure for storing machine account password + (ie. when samba server is member of a domain */ +struct machine_acct_pass { + uint8_t hash[16]; + time_t mod_time; +}; + +#define SECRETS_PRIMARY_DOMAIN_DN "cn=Primary Domains" +#define SECRETS_PRINCIPALS_DN "cn=Principals" +#define SECRETS_PRIMARY_DOMAIN_FILTER "(&(flatname=%s)(objectclass=primaryDomain))" +#define SECRETS_PRIMARY_REALM_FILTER "(&(realm=%s)(objectclass=primaryDomain))" +#define SECRETS_KRBTGT_SEARCH "(&((|(realm=%s)(flatname=%s))(samAccountName=krbtgt)))" +#define SECRETS_PRINCIPAL_SEARCH "(&(|(realm=%s)(flatname=%s))(servicePrincipalName=%s))" + +#endif /* _SECRETS_H */ diff --git a/source4/scripting/ejs/smbcalls_cli.c b/source4/scripting/ejs/smbcalls_cli.c index cc97282038..e165222a98 100644 --- a/source4/scripting/ejs/smbcalls_cli.c +++ b/source4/scripting/ejs/smbcalls_cli.c @@ -26,7 +26,7 @@ #include "libcli/raw/libcliraw.h" #include "libcli/composite/composite.h" #include "libcli/smb_composite/smb_composite.h" -#include "clilist.h" +#include "libcli/libcli.h" #if 0 diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h index 3280706eca..f673425dd3 100644 --- a/source4/smb_server/smb_server.h +++ b/source4/smb_server/smb_server.h @@ -20,6 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include "smb.h" #include "request.h" #include "smbd/process_model.h" diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c index a693d18ce3..104fdc1933 100644 --- a/source4/torture/basic/aliases.c +++ b/source4/torture/basic/aliases.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "dlinklist.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" int create_complex_file(struct smbcli_state *cli, TALLOC_CTX *mem_ctx, const char *fname); diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c index 5d13a5f689..e321993749 100644 --- a/source4/torture/basic/attr.c +++ b/source4/torture/basic/attr.c @@ -22,6 +22,7 @@ #include "includes.h" #include "torture/torture.h" +#include "libcli/libcli.h" extern int torture_failures; diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c index 7becdcd8e5..186b265e19 100644 --- a/source4/torture/basic/charset.c +++ b/source4/torture/basic/charset.c @@ -23,6 +23,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\chartest\\" diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 5523e1bb41..2c26f21ddc 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -27,6 +27,7 @@ #include "libcli/raw/libcliraw.h" #include "system/time.h" #include "system/filesys.h" +#include "libcli/libcli.h" #define BASEDIR "\\delaywrite" diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c index 3138f48d0f..c6ddd4bd70 100644 --- a/source4/torture/basic/delete.c +++ b/source4/torture/basic/delete.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "libcli/libcli.h" #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c index f633f843ff..2e68efa4eb 100644 --- a/source4/torture/basic/denytest.c +++ b/source4/torture/basic/denytest.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" extern BOOL torture_showall; extern int torture_failures; diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c index 49efff8d2e..9dd62f3aa1 100644 --- a/source4/torture/basic/dir.c +++ b/source4/torture/basic/dir.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "libcli/libcli.h" #include "torture/torture.h" #include "system/filesys.h" diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c index fca5d1968a..61b1750b92 100644 --- a/source4/torture/basic/disconnect.c +++ b/source4/torture/basic/disconnect.c @@ -24,6 +24,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\test_disconnect" diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c index e07d0648a7..307bb0fafc 100644 --- a/source4/torture/basic/locking.c +++ b/source4/torture/basic/locking.c @@ -24,6 +24,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #include "system/time.h" #include "system/filesys.h" diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c index 29bb4fcd18..8317a4ee18 100644 --- a/source4/torture/basic/mangle_test.c +++ b/source4/torture/basic/mangle_test.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "lib/tdb/include/tdbutil.h" +#include "libcli/libcli.h" #include "pstring.h" static TDB_CONTEXT *tdb; diff --git a/source4/torture/basic/properties.c b/source4/torture/basic/properties.c index 25a787dead..c20edf545b 100644 --- a/source4/torture/basic/properties.c +++ b/source4/torture/basic/properties.c @@ -23,6 +23,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" struct bitmapping { const char *name; diff --git a/source4/torture/basic/rename.c b/source4/torture/basic/rename.c index cdb2340b76..4bdc6f2d9f 100644 --- a/source4/torture/basic/rename.c +++ b/source4/torture/basic/rename.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "libcli/libcli.h" #include "torture/torture.h" /* diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index 5d48ee7124..6e79745e89 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" +#include "libcli/libcli.h" #include "libcli/raw/libcliraw.h" #include "system/filesys.h" #include "pstring.h" diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c index 70fd50834e..20b7e8a579 100644 --- a/source4/torture/basic/secleak.c +++ b/source4/torture/basic/secleak.c @@ -23,6 +23,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #include "system/time.h" #include "libcli/smb_composite/smb_composite.h" diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c index ec889078aa..d99fec5ee8 100644 --- a/source4/torture/basic/unlink.c +++ b/source4/torture/basic/unlink.c @@ -24,6 +24,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\unlinktest" diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c index f3f7429021..e76627fb03 100644 --- a/source4/torture/basic/utable.c +++ b/source4/torture/basic/utable.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/iconv.h" #include "system/filesys.h" +#include "libcli/libcli.h" #include "pstring.h" BOOL torture_utable(void) diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c index a576b57458..a82b899886 100644 --- a/source4/torture/gentest.c +++ b/source4/torture/gentest.c @@ -22,6 +22,7 @@ #include "system/time.h" #include "system/filesys.h" #include "request.h" +#include "libcli/libcli.h" #include "libcli/raw/libcliraw.h" #include "librpc/gen_ndr/ndr_security.h" #include "auth/gensec/gensec.h" diff --git a/source4/torture/locktest.c b/source4/torture/locktest.c index be2d3022da..02bf901428 100644 --- a/source4/torture/locktest.c +++ b/source4/torture/locktest.c @@ -23,6 +23,7 @@ #include "system/time.h" #include "pstring.h" #include "auth/gensec/gensec.h" +#include "libcli/libcli.h" static int numops = 1000; static BOOL showall; diff --git a/source4/torture/masktest.c b/source4/torture/masktest.c index ca5bdf7c21..cb88e573e2 100644 --- a/source4/torture/masktest.c +++ b/source4/torture/masktest.c @@ -20,7 +20,7 @@ #include "includes.h" #include "system/filesys.h" -#include "clilist.h" +#include "libcli/libcli.h" #include "libcli/raw/libcliraw.h" #include "system/time.h" #include "pstring.h" diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c index 353140a706..4357dd53a1 100644 --- a/source4/torture/nbench/nbench.c +++ b/source4/torture/nbench/nbench.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" +#include "libcli/libcli.h" #include "system/filesys.h" #include "pstring.h" diff --git a/source4/torture/nbench/nbio.c b/source4/torture/nbench/nbio.c index 40d9277c6e..3e4c9a0f92 100644 --- a/source4/torture/nbench/nbio.c +++ b/source4/torture/nbench/nbio.c @@ -24,6 +24,7 @@ #include "system/time.h" #include "system/filesys.h" #include "dlinklist.h" +#include "libcli/libcli.h" #include "libcli/raw/libcliraw.h" #define MAX_FILES 100 diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index 1b98275e93..e9cb45e3b0 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -23,6 +23,7 @@ #include "torture/torture.h" #include "rap.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" struct rap_call { uint16_t callno; diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c index 119377731b..6450acab18 100644 --- a/source4/torture/raw/acls.c +++ b/source4/torture/raw/acls.c @@ -23,6 +23,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\testsd" diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c index 92fe5dd2d5..4b19372b10 100644 --- a/source4/torture/raw/chkpath.c +++ b/source4/torture/raw/chkpath.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\rawchkpath" diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c index 67050f30a3..e19fe0f3cb 100644 --- a/source4/torture/raw/close.c +++ b/source4/torture/raw/close.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/time.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" /* basic testing of all RAW_CLOSE_* calls diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c index f9fe0eb83c..760d464fb5 100644 --- a/source4/torture/raw/composite.c +++ b/source4/torture/raw/composite.c @@ -24,6 +24,7 @@ #include "torture/torture.h" #include "lib/events/events.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #include "libcli/composite/composite.h" #include "libcli/smb_composite/smb_composite.h" #include "lib/cmdline/popt_common.h" diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c index 8a8bfc85fb..43e059e23d 100644 --- a/source4/torture/raw/context.c +++ b/source4/torture/raw/context.c @@ -25,6 +25,7 @@ #include "libcli/smb_composite/smb_composite.h" #include "lib/cmdline/popt_common.h" #include "lib/events/events.h" +#include "libcli/libcli.h" #define BASEDIR "\\rawcontext" diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c index a1f9bbfe52..3bc954d572 100644 --- a/source4/torture/raw/eas.c +++ b/source4/torture/raw/eas.c @@ -24,6 +24,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\testeas" diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c index 5a88e336cb..0fb48c292b 100644 --- a/source4/torture/raw/ioctl.c +++ b/source4/torture/raw/ioctl.c @@ -23,6 +23,7 @@ #include "torture/torture.h" #include "ioctl.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\rawioctl" diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index da3c956afb..f18df47528 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -23,6 +23,7 @@ #include "libcli/raw/libcliraw.h" #include "system/time.h" #include "system/filesys.h" +#include "libcli/libcli.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c index e1cc33bf84..ac19ee1187 100644 --- a/source4/torture/raw/mkdir.c +++ b/source4/torture/raw/mkdir.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\mkdirtest" diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c index d941c01f1a..97a1bf3cc4 100644 --- a/source4/torture/raw/mux.c +++ b/source4/torture/raw/mux.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\test_mux" diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index e28ab3a540..9a5831d69c 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\test_notify" diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c index a1d17587e7..2afad96956 100644 --- a/source4/torture/raw/open.c +++ b/source4/torture/raw/open.c @@ -25,6 +25,7 @@ #include "system/filesys.h" #include "librpc/gen_ndr/ndr_security.h" #include "lib/events/events.h" +#include "libcli/libcli.h" /* enum for whether reads/writes are possible on a file */ enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR}; diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 512e42d867..64da410bd2 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_security.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define CHECK_VAL(v, correct) do { \ if ((v) != (correct)) { \ diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c index 57a2ac69c0..6ed57227ac 100644 --- a/source4/torture/raw/qfileinfo.c +++ b/source4/torture/raw/qfileinfo.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" static struct { const char *name; diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c index 2edceeb2b1..26bac4c0ad 100644 --- a/source4/torture/raw/qfsinfo.c +++ b/source4/torture/raw/qfsinfo.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" static struct { diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index cb400d871f..aab879a1d1 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -23,6 +23,7 @@ #include "libcli/raw/libcliraw.h" #include "system/time.h" #include "system/filesys.h" +#include "libcli/libcli.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c index 99d8116b31..c1b24f2b3a 100644 --- a/source4/torture/raw/rename.c +++ b/source4/torture/raw/rename.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index 80d1bb5b3f..5cb67b068e 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\testsearch" diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c index cf16ed2354..b0993b67cc 100644 --- a/source4/torture/raw/seek.c +++ b/source4/torture/raw/seek.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index 8055fc7575..29521980be 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/time.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define BASEDIR "\\testsfileinfo" diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c index 71ff9332fd..22b7d06cdd 100644 --- a/source4/torture/raw/streams.c +++ b/source4/torture/raw/streams.c @@ -24,6 +24,7 @@ #include "torture/torture.h" #include "libcli/raw/libcliraw.h" #include "system/filesys.h" +#include "libcli/libcli.h" #define BASEDIR "\\teststreams" diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c index fc92668f38..4c91ab58ba 100644 --- a/source4/torture/raw/unlink.c +++ b/source4/torture/raw/unlink.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c index 2628950606..4209d66892 100644 --- a/source4/torture/raw/write.c +++ b/source4/torture/raw/write.c @@ -24,6 +24,7 @@ #include "libcli/raw/libcliraw.h" #include "system/time.h" #include "system/filesys.h" +#include "libcli/libcli.h" #define CHECK_STATUS(status, correct) do { \ if (!NT_STATUS_EQUAL(status, correct)) { \ diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c index bdeda05613..ab12362759 100644 --- a/source4/torture/rpc/netlogon.c +++ b/source4/torture/rpc/netlogon.c @@ -26,6 +26,7 @@ #include "torture/torture.h" #include "lib/events/events.h" #include "auth/auth.h" +#include "smb.h" #include "lib/cmdline/popt_common.h" static const char *machine_password; diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c index d373e0c817..e109bb7f30 100644 --- a/source4/torture/rpc/samr.c +++ b/source4/torture/rpc/samr.c @@ -24,6 +24,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_lsa.h" #include "librpc/gen_ndr/ndr_samr.h" +#include "smb.h" #include "lib/crypto/crypto.h" #define TEST_ACCOUNT_NAME "samrtorturetest" diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c index 622b6ac08a..f844ad8ca8 100644 --- a/source4/torture/rpc/testjoin.c +++ b/source4/torture/rpc/testjoin.c @@ -31,6 +31,7 @@ #include "lib/crypto/crypto.h" #include "libnet/libnet.h" #include "lib/cmdline/popt_common.h" +#include "smb.h" #include "lib/ldb/include/ldb.h" diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c index 2077bb0227..d4016b8770 100644 --- a/source4/torture/smb2/connect.c +++ b/source4/torture/smb2/connect.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "smb.h" #include "libcli/smb2/smb2.h" #include "libcli/smb2/smb2_calls.h" diff --git a/source4/torture/torture.c b/source4/torture/torture.c index ff1a72799b..fd8fc6fd6b 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -25,6 +25,7 @@ #include "system/wait.h" #include "system/filesys.h" #include "ioctl.h" +#include "libcli/libcli.h" #include "librpc/rpc/dcerpc_table.h" int torture_nprocs=4; diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c index ce457582d3..fefbfcf568 100644 --- a/source4/torture/torture_util.c +++ b/source4/torture/torture_util.c @@ -20,6 +20,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" +#include "libcli/libcli.h" #include "system/shmem.h" #include "system/time.h" -- cgit