r3453: - split out the auth and popt includes

- tidied up some of the system includes

- moved a few more structures back from misc.idl to netlogon.idl and samr.idl now that pidl
  knows about inter-IDL dependencies
(This used to be commit 7b7477ac42d96faac1b0ff361525d2c63cedfc64)

diff --git a/source4/auth/auth.c b/source4/auth/auth.c
index 23dae12811444ee8c5059c9ff164112dd0d2bea8..7fe446baf950a536d8a5e1b98287a278ca3a7955 100644 (file)
--- a/source4/auth/auth.c
+++ b/source4/auth/auth.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source4/auth/auth.h b/source4/auth/auth.h
index 98b099428330afd1a87a32bebb9bfa6c04367235..dc57d349b4871e438f898e2767567bfe49d3b6b4 100644 (file)
--- a/source4/auth/auth.h
+++ b/source4/auth/auth.h
@@ -21,6 +21,11 @@
 #ifndef _SAMBA_AUTH_H
 #define _SAMBA_AUTH_H
 
+#include "libcli/auth/ntlmssp.h"
+#include "libcli/auth/credentials.h"
+#include "libcli/auth/gensec.h"
+#include "libcli/auth/spnego.h"
+
 /* modules can use the following to determine if the interface has changed
  * please increment the version number after each interface change
  * with a comment and maybe update struct auth_critical_sizes.

diff --git a/source4/auth/auth_builtin.c b/source4/auth/auth_builtin.c
index 30f50806dc6e048283516bc67ba3b29a62cb8764..611552e9033f847c7858ba2e47f3a374638066b9 100644 (file)
--- a/source4/auth/auth_builtin.c
+++ b/source4/auth/auth_builtin.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 5aff1d07e6c89f5f329bfe8e25d4ea3dd08db146..636935e0b97d121ee3b0dd2b233b7fe7678b830b 100644 (file)
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "system/time.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source4/auth/auth_util.c b/source4/auth/auth_util.c
index 3565fbd0dc5e5c56a57385e2d4c2e466e5cf3cc0..e3604997dc37bf12eaa2005a9cf82f61c6eb3a2b 100644 (file)
--- a/source4/auth/auth_util.c
+++ b/source4/auth/auth_util.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source4/auth/auth_winbind.c b/source4/auth/auth_winbind.c
index 2f54adcdfd9a8e124d2611febacf1adf61676708..986cadb86fdb16a00687209cbe18bf2b2c76305f 100644 (file)
--- a/source4/auth/auth_winbind.c
+++ b/source4/auth/auth_winbind.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source4/client/client.c b/source4/client/client.c
index 4a7f0dd2581ef8b718ea25e6d6082e4e3c727725..14d31628c70c29c972d2b6913ea9ad0eb875fc99 100644 (file)
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_srvsvc.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"

diff --git a/source4/gtk/tools/gregedit.c b/source4/gtk/tools/gregedit.c
index d7a1e44ad11c86b6509056e39117654bfea51df5..c2ae0438925bbac467deb4bffef626ff2599dc91 100644 (file)
--- a/source4/gtk/tools/gregedit.c
+++ b/source4/gtk/tools/gregedit.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 #include "gtk/common/select.h"
 #include "gtk/common/gtk-smb.h"
 

diff --git a/source4/include/includes.h b/source4/include/includes.h
index c38c0acc8b7dce8c7f69a1074b55197e09ff122e..f45665ad0528d217410eae97549e0979f93cea4c 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -72,12 +72,10 @@
 /** Feel free to add definitions for other compilers here. */
 #endif
 
-#include <unistd.h>
 #include <sys/types.h>
-#include <unistd.h>
 #include <stdio.h>
-#include <stddef.h>
 #include <stdlib.h>
+#include <stddef.h>
 
 #ifdef HAVE_STDINT_H
 #include <stdint.h>
@@ -87,53 +85,15 @@
 #include <string.h>
 #endif
 
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-
-#ifdef HAVE_MEMORY_H
-#include <memory.h>
-#endif
-
-#ifdef HAVE_MALLOC_H
-#include <malloc.h>
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#else
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-#endif
-
-#include <sys/stat.h>
-
-#ifdef HAVE_SYS_IOCTL_H
-#include <sys/ioctl.h>
-#endif
-
 #include <signal.h>
-
 #include <errno.h>
 
-#ifdef HAVE_SYS_MODE_H
-/* apparently AIX needs this for S_ISLNK */
-#ifndef S_ISLNK
-#include <sys/mode.h>
-#endif
-#endif
-
 #ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 
-#ifdef HAVE_STROPTS_H
-#include <stropts.h>
-#endif
-
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS
@@ -220,10 +180,6 @@ struct ipv4_addr {
 #define UINT16_MAX 65535
 #endif
 
-/*
- * Type for stat structure.
- */
-
 #ifndef MIN
 #define MIN(a,b) ((a)<(b)?(a):(b))
 #endif
@@ -300,12 +256,6 @@ extern int errno;
 #include "librpc/rpc/dcerpc.h"
 #include "librpc/gen_ndr/tables.h"
 
-#include "libcli/auth/ntlmssp.h"
-#include "libcli/auth/credentials.h"
-#include "libcli/auth/gensec.h"
-#include "libcli/auth/spnego.h"
-#include "auth/auth.h"
-
 #include "smb_interfaces.h"
 #include "smbd/server.h"
 #include "smbd/service.h"
@@ -491,105 +441,11 @@ int vasprintf(char **ptr, const char *format, va_list ap);
 #define MSG_WAITALL 0
 #endif
 
-/* default socket options. Dave Miller thinks we should default to TCP_NODELAY
-   given the socket IO pattern that Samba uses */
-#ifdef TCP_NODELAY
-#define DEFAULT_SOCKET_OPTIONS "TCP_NODELAY"
-#else
-#define DEFAULT_SOCKET_OPTIONS ""
-#endif
-
 /* Load header file for dynamic linking stuff */
-
 #ifdef HAVE_DLFCN_H
 #include <dlfcn.h>
 #endif
 
-/* dmalloc -- free heap debugger (dmalloc.org).  This should be near
- * the *bottom* of include files so as not to conflict. */
-#ifdef ENABLE_DMALLOC
-#  include <dmalloc.h>
-#endif
-
-
-/* Some POSIX definitions for those without */
- 
-#ifndef S_IFDIR
-#define S_IFDIR         0x4000
-#endif
-#ifndef S_ISDIR
-#define S_ISDIR(mode)   ((mode & 0xF000) == S_IFDIR)
-#endif
-#ifndef S_IRWXU
-#define S_IRWXU 00700           /* read, write, execute: owner */
-#endif
-#ifndef S_IRUSR
-#define S_IRUSR 00400           /* read permission: owner */
-#endif
-#ifndef S_IWUSR
-#define S_IWUSR 00200           /* write permission: owner */
-#endif
-#ifndef S_IXUSR
-#define S_IXUSR 00100           /* execute permission: owner */
-#endif
-#ifndef S_IRWXG
-#define S_IRWXG 00070           /* read, write, execute: group */
-#endif
-#ifndef S_IRGRP
-#define S_IRGRP 00040           /* read permission: group */
-#endif
-#ifndef S_IWGRP
-#define S_IWGRP 00020           /* write permission: group */
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 00010           /* execute permission: group */
-#endif
-#ifndef S_IRWXO
-#define S_IRWXO 00007           /* read, write, execute: other */
-#endif
-#ifndef S_IROTH
-#define S_IROTH 00004           /* read permission: other */
-#endif
-#ifndef S_IWOTH
-#define S_IWOTH 00002           /* write permission: other */
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 00001           /* execute permission: other */
-#endif
-
-/* For sys_adminlog(). */
-#ifndef LOG_EMERG
-#define LOG_EMERG       0       /* system is unusable */
-#endif
-
-#ifndef LOG_ALERT
-#define LOG_ALERT       1       /* action must be taken immediately */
-#endif
-
-#ifndef LOG_CRIT
-#define LOG_CRIT        2       /* critical conditions */
-#endif
-
-#ifndef LOG_ERR
-#define LOG_ERR         3       /* error conditions */
-#endif
-
-#ifndef LOG_WARNING
-#define LOG_WARNING     4       /* warning conditions */
-#endif
-
-#ifndef LOG_NOTICE
-#define LOG_NOTICE      5       /* normal but significant condition */
-#endif
-
-#ifndef LOG_INFO
-#define LOG_INFO        6       /* informational */
-#endif
-
-#ifndef LOG_DEBUG
-#define LOG_DEBUG       7       /* debug-level messages */
-#endif
-
 extern int DEBUGLEVEL;
 
 #ifndef RTLD_LAZY
@@ -631,25 +487,6 @@ time_t timegm(struct tm *tm);
 #define strlen(x) valgrind_strlen(x)
 #endif
 
-/*
- * Veritas File System.  Often in addition to native.
- * Quotas different.
- */
-#if defined(HAVE_SYS_FS_VX_QUOTA_H)
-#define VXFS_QUOTA
-#endif
-
-#if HAVE_SYS_ATTRIBUTES_H
-#include <sys/attributes.h>
-#endif
-
-/* mutually exclusive (SuSE 8.2) */
-#if HAVE_ATTR_XATTR_H
-#include <attr/xattr.h>
-#elif HAVE_SYS_XATTR_H
-#include <sys/xattr.h>
-#endif
-
 #define TALLOC_ABORT(reason) smb_panic(reason)
 
 

diff --git a/source4/include/rewrite.h b/source4/include/rewrite.h
index b26c8f2e5d0db51f012becde79bc1ae6bbb2c0f1..8b5e00fdd2ecfc654123bae11ffea69d443b1b6c 100644 (file)
--- a/source4/include/rewrite.h
+++ b/source4/include/rewrite.h
@@ -111,6 +111,4 @@ typedef struct {
        void *cd_direct, *cd_pull, *cd_push;
 } *smb_iconv_t;
 
-#include "lib/cmdline/popt_common.h"
-
 #endif /* _REWRITE_H */

diff --git a/source4/include/structs.h b/source4/include/structs.h
index 428495ef13bf0bb28709bc0355c93f13a25f490d..6bc19b112743c3d0a7a3104f8ebb7b97301388e9 100644 (file)
--- a/source4/include/structs.h
+++ b/source4/include/structs.h
@@ -44,6 +44,7 @@ struct samr_ChangePasswordUser3;
 struct samr_ChangePasswordUser2;
 struct samr_CryptPassword;
 struct samr_CryptPasswordEx;
+struct samr_LogonHours;
 
 struct netr_SamInfo3;
 struct netr_Authenticator;
@@ -52,3 +53,14 @@ struct iface_struct;
 
 struct tm;
 struct utimbuf;
+
+
+struct auth_usersupplied_info;
+struct auth_serversupplied_info;
+struct creds_CredentialState;
+struct ntlmssp_state;
+struct auth_methods;
+struct schannel_state;
+struct spnego_data;
+typedef NTSTATUS (*gensec_password_callback)(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, 
+                                            char **password);

diff --git a/source4/include/system/filesys.h b/source4/include/system/filesys.h
index d038d8c08558added85c4f988ebb5f9953d0c848..dc13e148e5adae18358e217ead127cafd8ed1acf 100644 (file)
--- a/source4/include/system/filesys.h
+++ b/source4/include/system/filesys.h
@@ -20,6 +20,9 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <unistd.h>
+#include <sys/stat.h>
+
 #ifdef HAVE_SYS_MOUNT_H
 #include <sys/mount.h>
 #endif
@@ -58,3 +61,87 @@
 
 #include <sys/file.h>
 
+#ifdef HAVE_FCNTL_H
+#include <fcntl.h>
+#else
+#ifdef HAVE_SYS_FCNTL_H
+#include <sys/fcntl.h>
+#endif
+#endif
+
+#ifdef HAVE_SYS_MODE_H
+/* apparently AIX needs this for S_ISLNK */
+#ifndef S_ISLNK
+#include <sys/mode.h>
+#endif
+#endif
+
+#ifdef HAVE_SYS_IOCTL_H
+#include <sys/ioctl.h>
+#endif
+
+/*
+ * Veritas File System.  Often in addition to native.
+ * Quotas different.
+ */
+#if defined(HAVE_SYS_FS_VX_QUOTA_H)
+#define VXFS_QUOTA
+#endif
+
+#if HAVE_SYS_ATTRIBUTES_H
+#include <sys/attributes.h>
+#endif
+
+/* mutually exclusive (SuSE 8.2) */
+#if HAVE_ATTR_XATTR_H
+#include <attr/xattr.h>
+#elif HAVE_SYS_XATTR_H
+#include <sys/xattr.h>
+#endif
+
+
+/* Some POSIX definitions for those without */
+ 
+#ifndef S_IFDIR
+#define S_IFDIR         0x4000
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(mode)   ((mode & 0xF000) == S_IFDIR)
+#endif
+#ifndef S_IRWXU
+#define S_IRWXU 00700           /* read, write, execute: owner */
+#endif
+#ifndef S_IRUSR
+#define S_IRUSR 00400           /* read permission: owner */
+#endif
+#ifndef S_IWUSR
+#define S_IWUSR 00200           /* write permission: owner */
+#endif
+#ifndef S_IXUSR
+#define S_IXUSR 00100           /* execute permission: owner */
+#endif
+#ifndef S_IRWXG
+#define S_IRWXG 00070           /* read, write, execute: group */
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 00040           /* read permission: group */
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP 00020           /* write permission: group */
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 00010           /* execute permission: group */
+#endif
+#ifndef S_IRWXO
+#define S_IRWXO 00007           /* read, write, execute: other */
+#endif
+#ifndef S_IROTH
+#define S_IROTH 00004           /* read permission: other */
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH 00002           /* write permission: other */
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 00001           /* execute permission: other */
+#endif
+

diff --git a/source4/include/system/syslog.h b/source4/include/system/syslog.h
index 7fcb87784bfe6659766ef04dcb79cb810bdfaa62..7182e2e2d683b79d764313b869f3551e7fb1238f 100644 (file)
--- a/source4/include/system/syslog.h
+++ b/source4/include/system/syslog.h
@@ -28,3 +28,36 @@
 #endif
 #endif
 
+/* For sys_adminlog(). */
+#ifndef LOG_EMERG
+#define LOG_EMERG       0       /* system is unusable */
+#endif
+
+#ifndef LOG_ALERT
+#define LOG_ALERT       1       /* action must be taken immediately */
+#endif
+
+#ifndef LOG_CRIT
+#define LOG_CRIT        2       /* critical conditions */
+#endif
+
+#ifndef LOG_ERR
+#define LOG_ERR         3       /* error conditions */
+#endif
+
+#ifndef LOG_WARNING
+#define LOG_WARNING     4       /* warning conditions */
+#endif
+
+#ifndef LOG_NOTICE
+#define LOG_NOTICE      5       /* normal but significant condition */
+#endif
+
+#ifndef LOG_INFO
+#define LOG_INFO        6       /* informational */
+#endif
+
+#ifndef LOG_DEBUG
+#define LOG_DEBUG       7       /* debug-level messages */
+#endif
+

diff --git a/source4/ldap_server/ldap_server.c b/source4/ldap_server/ldap_server.c
index 6013b6ecf4f08c7367faa6da508039f145fa4540..0cc83eca6503daadbb9dc92b98fdcef76732a694 100644 (file)
--- a/source4/ldap_server/ldap_server.c
+++ b/source4/ldap_server/ldap_server.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 /*
   close the socket and shutdown a server_context

diff --git a/source4/lib/cmdline/popt_common.c b/source4/lib/cmdline/popt_common.c
index bd46373d581c8ae58a77b3d889e035a7f5094458..80be23d3649839a901f09259d83f112500224320 100644 (file)
--- a/source4/lib/cmdline/popt_common.c
+++ b/source4/lib/cmdline/popt_common.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 
 /* Handle command line options:
  *             -d,--debuglevel 

diff --git a/source4/lib/registry/tools/regdiff.c b/source4/lib/registry/tools/regdiff.c
index bedf3222d1de46ca0123774b334462cc373977a9..1d69734f218424dd61740f9233e232db24b47e4a 100644 (file)
--- a/source4/lib/registry/tools/regdiff.c
+++ b/source4/lib/registry/tools/regdiff.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 
 static void writediff(struct registry_key *oldkey, struct registry_key *newkey, FILE *out)
 {

diff --git a/source4/lib/registry/tools/regpatch.c b/source4/lib/registry/tools/regpatch.c
index eed249d353e9d63e53d2bb6b92f15927507e4f26..298a922fbfdca7b2b75aae2260bbe602a5dbca42 100644 (file)
--- a/source4/lib/registry/tools/regpatch.c
+++ b/source4/lib/registry/tools/regpatch.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 
 /*
  * Routines to parse a REGEDIT4 file

diff --git a/source4/lib/registry/tools/regshell.c b/source4/lib/registry/tools/regshell.c
index 8449446c8639b661bdd58acd717c23b9da6f025f..fcc72044231f60794db9510cec70e7990db35ed7 100644 (file)
--- a/source4/lib/registry/tools/regshell.c
+++ b/source4/lib/registry/tools/regshell.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 #include "system/time.h"
 
 /* 

diff --git a/source4/lib/registry/tools/regtree.c b/source4/lib/registry/tools/regtree.c
index 66bce1e499d4cfd865db1578ed24f1ba4261fe49..64948b06fea557736b3fabab14d46099eeb36199 100644 (file)
--- a/source4/lib/registry/tools/regtree.c
+++ b/source4/lib/registry/tools/regtree.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 
 static void print_tree(int l, struct registry_key *p, int fullpath, int novals)
 {

diff --git a/source4/libcli/auth/credentials.c b/source4/libcli/auth/credentials.c
index f3f8324005fe4d16fb241e2cd4cedcb9e144433d..4a17b13910931e6e1ad5187eb79d448daa977ebc 100644 (file)
--- a/source4/libcli/auth/credentials.c
+++ b/source4/libcli/auth/credentials.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "auth/auth.h"
 
 /*
   initialise the credentials state for old-style 64 bit session keys

diff --git a/source4/libcli/auth/gensec.c b/source4/libcli/auth/gensec.c
index a00a36e17156e6abbcd1c71239113a5c0b4010be..aab1928687b1bee5102752e91c7a2b0f2cd60281 100644 (file)
--- a/source4/libcli/auth/gensec.c
+++ b/source4/libcli/auth/gensec.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 /* the list of currently registered GENSEC backends */
 const static struct gensec_security_ops **generic_security_ops;

diff --git a/source4/libcli/auth/gensec.h b/source4/libcli/auth/gensec.h
index 624c7ebe1d9cc3f4280ecbb7e2375420c555db1f..b2c685332b0ae32ffd1ee2ea8500de57e95a1c40 100644 (file)
--- a/source4/libcli/auth/gensec.h
+++ b/source4/libcli/auth/gensec.h
@@ -82,9 +82,6 @@ struct gensec_security_ops {
        void (*end)(struct gensec_security *gensec_security);
 };
        
-typedef NTSTATUS (*gensec_password_callback)(struct gensec_security *gensec_security, TALLOC_CTX *mem_ctx, 
-                                            char **password);
-
 #define GENSEC_INTERFACE_VERSION 0
 
 struct gensec_security {

diff --git a/source4/libcli/auth/gensec_krb5.c b/source4/libcli/auth/gensec_krb5.c
index f393ce09c15e983c309c4bc32d800c3492c7d3e3..0e374e8219dbdb1175356afe7fcb78957dbc9820 100644 (file)
--- a/source4/libcli/auth/gensec_krb5.c
+++ b/source4/libcli/auth/gensec_krb5.c
@@ -27,6 +27,7 @@
 #include "system/kerberos.h"
 #include "libcli/auth/kerberos.h"
 #include "librpc/gen_ndr/ndr_krb5pac.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c
index f75e7b4d73696d19c79b5e44f580986dba0b0aa5..4b1d5f3b0267063f372aee004e3ec97ca32a0927 100644 (file)
--- a/source4/libcli/auth/gensec_ntlmssp.c
+++ b/source4/libcli/auth/gensec_ntlmssp.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 struct gensec_ntlmssp_state {
        struct auth_context *auth_context;

diff --git a/source4/libcli/auth/ntlmssp.c b/source4/libcli/auth/ntlmssp.c
index 2ea0bcb84eea38349b712d6c40ce5607217bd6c1..96c733e3b05542787b10a09c00b53f9afbd3e4e3 100644 (file)
--- a/source4/libcli/auth/ntlmssp.c
+++ b/source4/libcli/auth/ntlmssp.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, 
                                       TALLOC_CTX *out_mem_ctx, 

diff --git a/source4/libcli/auth/ntlmssp_sign.c b/source4/libcli/auth/ntlmssp_sign.c
index 5a99f14496ed0df94842d0c5a8840156bd7147e7..689a2d353ebf73e87c0f842f177a1e626e1756bb 100644 (file)
--- a/source4/libcli/auth/ntlmssp_sign.c
+++ b/source4/libcli/auth/ntlmssp_sign.c
@@ -21,6 +21,7 @@
  */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 #define CLI_SIGN "session key to client-to-server signing key magic constant"
 #define CLI_SEAL "session key to client-to-server sealing key magic constant"

diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c
index 2779f47474fcbeb8072a9cff361712025ab914d0..ef9763cad7bd82e398feb10c8b5320714a987ed2 100644 (file)
--- a/source4/libcli/auth/spnego.c
+++ b/source4/libcli/auth/spnego.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source4/libcli/auth/spnego_parse.c b/source4/libcli/auth/spnego_parse.c
index 12d3d05734868163a116f8a0d4ef11bdd182564e..d6eacc4a6ab6e1f4dcc59a7732756d33c1a87473 100644 (file)
--- a/source4/libcli/auth/spnego_parse.c
+++ b/source4/libcli/auth/spnego_parse.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_AUTH

diff --git a/source4/libcli/cliconnect.c b/source4/libcli/cliconnect.c
index 2949633b86c03e2291e669eab6f3ca033da3d314..2c66a1b5b3e08005807a33a87314b1f657ee7634 100644 (file)
--- a/source4/libcli/cliconnect.c
+++ b/source4/libcli/cliconnect.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 
 /*

diff --git a/source4/libcli/ldap/ldap.c b/source4/libcli/ldap/ldap.c
index 987a8222195ba69a34a7328ddca64d32c0f064c8..9b481313e3fd07d3188a74a5e381f2c61b1dcea7 100644 (file)
--- a/source4/libcli/ldap/ldap.c
+++ b/source4/libcli/ldap/ldap.c
@@ -26,6 +26,7 @@
 #include "includes.h"
 #include "system/network.h"
 #include "system/iconv.h"
+#include "auth/auth.h"
 
 /****************************************************************************
  *

diff --git a/source4/libcli/raw/clisession.c b/source4/libcli/raw/clisession.c
index 14018f676c3914f16ffe57058ff48007f48130ce..23e1d8507ee4751c642893eddf5c4fad546cc28d 100644 (file)
--- a/source4/libcli/raw/clisession.c
+++ b/source4/libcli/raw/clisession.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "auth/auth.h"
 
 #define SETUP_REQUEST_SESSION(cmd, wct, buflen) do { \
        req = smbcli_request_setup_session(session, cmd, wct, buflen); \

diff --git a/source4/libcli/util/smbencrypt.c b/source4/libcli/util/smbencrypt.c
index 1cf0890ba87dc99238f0989d32d62026a1beeb0c..1e911f094b7756fc2e291105102301f522a2b858 100644 (file)
--- a/source4/libcli/util/smbencrypt.c
+++ b/source4/libcli/util/smbencrypt.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #include "system/time.h"
-#include "byteorder.h"
+#include "auth/auth.h"
 
 /*
    This implements the X/Open SMB password encryption

diff --git a/source4/librpc/idl/misc.idl b/source4/librpc/idl/misc.idl
index ce884b6c5ce8266c7d4bbe0522a684ebd03e5f74..dd31f0f54aa37b6fd9d6b264916eac9fbdde7ec3 100644 (file)
--- a/source4/librpc/idl/misc.idl
+++ b/source4/librpc/idl/misc.idl
@@ -123,24 +123,10 @@ interface misc
                GUID   uuid;
        } policy_handle;
 
-       /* this is also used in samr and netlogon */
-       typedef [public, flag(NDR_PAHEX)] struct {
-               uint16 units_per_week;
-               [size_is(1260), length_is(units_per_week/8)] uint8 *bitmap;
-       } samr_LogonHours;
-
        typedef [public, flag(NDR_PAHEX)] struct {
                uint8 hash[16];
        } samr_Password;
 
-       typedef [public,flag(NDR_PAHEX)] struct {
-               uint8 key[16];
-       } netr_UserSessionKey;
-
-       typedef [public,flag(NDR_PAHEX)] struct {
-               uint8 key[8];
-       } netr_LMSessionKey;
-
        typedef [public, flag(NDR_PAHEX)] struct {
                uint8 data[8];
        } netr_Credential;

diff --git a/source4/librpc/idl/netlogon.idl b/source4/librpc/idl/netlogon.idl
index b880698ffd3de22ace7dd43fdcad54409425c73f..7f04d2b648256aa8b354dd33ade0fd3129030aa4 100644 (file)
--- a/source4/librpc/idl/netlogon.idl
+++ b/source4/librpc/idl/netlogon.idl
@@ -129,6 +129,14 @@ interface netlogon
                uint32 attributes;
        } netr_GroupMembership;
 
+       typedef [public,flag(NDR_PAHEX)] struct {
+               uint8 key[16];
+       } netr_UserSessionKey;
+
+       typedef [public,flag(NDR_PAHEX)] struct {
+               uint8 key[8];
+       } netr_LMSessionKey;
+
        typedef [public] struct {
                NTTIME last_logon;
                NTTIME last_logoff;

diff --git a/source4/librpc/idl/samr.idl b/source4/librpc/idl/samr.idl
index 4d41e389e6eb09505389529f827c4274af64801e..df33066a1240293bc2cf1526b5a18694f3eaf59f 100644 (file)
--- a/source4/librpc/idl/samr.idl
+++ b/source4/librpc/idl/samr.idl
@@ -567,6 +567,12 @@
                uint16 code_page;
        } samr_UserInfo2;
 
+       /* this is also used in samr and netlogon */
+       typedef [public, flag(NDR_PAHEX)] struct {
+               uint16 units_per_week;
+               [size_is(1260), length_is(units_per_week/8)] uint8 *bitmap;
+       } samr_LogonHours;
+
        typedef struct {
                samr_Name account_name;
                samr_Name full_name;

diff --git a/source4/librpc/rpc/dcerpc_schannel.c b/source4/librpc/rpc/dcerpc_schannel.c
index d6fc7ad5116db1a6a7bed9657a863f7a4f9497c0..3472e1cbe2343b8ce096eabdb8126f1ce033e6f8 100644 (file)
--- a/source4/librpc/rpc/dcerpc_schannel.c
+++ b/source4/librpc/rpc/dcerpc_schannel.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_schannel.h"
+#include "auth/auth.h"
 
 enum schannel_position {
        DCERPC_SCHANNEL_STATE_START = 0,

diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index 062f6b1b85dd7f6b2731feebaf8ed655bef32c59..296dadcfe4372de12e44e139d82490b104ca8307 100644 (file)
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 struct unixuid_private {
        void *samctx;

diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 8e6538cc12525de49908cf55358a3e7de63def6a..5b461182006cd240f832d135790e891d905316a4 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -55,6 +55,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "system/iconv.h"
+#include "system/network.h"
 #include "librpc/gen_ndr/ndr_svcctl.h"
 
 BOOL in_client = False;                /* Not in the client by default */
@@ -911,7 +912,9 @@ static void init_globals(void)
 
        /* options that can be set on the command line must be initialised via
           the slower do_parameter() to ensure that FLAG_CMDLINE is obeyed */
-       do_parameter("socket options", DEFAULT_SOCKET_OPTIONS);
+#ifdef TCP_NODELAY
+       do_parameter("socket options", "TCP_NODELAY");
+#endif
        do_parameter("workgroup", DEFAULT_WORKGROUP);
        do_parameter("netbios name", get_myname());
        do_parameter("max protocol", "NT1");

diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 652aa87f5a8a088ab7535c4774c33f480f24210e..32addde703e88d143117c8b24644db0de64706bf 100644 (file)
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -23,8 +23,8 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
-#include "librpc/gen_ndr/ndr_dcom.h"
 #include "librpc/gen_ndr/ndr_oxidresolver.h"
+#include "auth/auth.h"
 
 /*
   see if two endpoints match

diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
index 61f0f58fbaf7a07c00f4bf8f3323e6b04cd65818..e4afa3d45e28718b4a6810ec42eeffa0ade2cdb6 100644 (file)
--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
@@ -23,6 +23,8 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "rpc_server/common/common.h"
+#include "librpc/gen_ndr/ndr_dcom.h"
+#include "auth/auth.h"
 
 struct server_pipe_state {
        struct netr_Credential client_challenge;

diff --git a/source4/rpc_server/netlogon/schannel_state.c b/source4/rpc_server/netlogon/schannel_state.c
index 6e46108e7aef8d84774cc83580f1a8a627c6bc23..8797ffa120d90cd7d47eaa17bc93d4c8a244e330 100644 (file)
--- a/source4/rpc_server/netlogon/schannel_state.c
+++ b/source4/rpc_server/netlogon/schannel_state.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "auth/auth.h"
 
 /* a reasonable amount of time to keep credentials live */
 #define SCHANNEL_CREDENTIALS_EXPIRY 600

diff --git a/source4/rpc_server/samr/dcesrv_samr.c b/source4/rpc_server/samr/dcesrv_samr.c
index b3938ce41705cb11ffd0755502751ea41364f333..e1dc234f195099bde80f2a8776908553582cc89c 100644 (file)
--- a/source4/rpc_server/samr/dcesrv_samr.c
+++ b/source4/rpc_server/samr/dcesrv_samr.c
@@ -1054,7 +1054,7 @@ static NTSTATUS samr_OpenGroup(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
 } while (0)
 
 #define SET_LHOURS(msg, field, attr) do { \
-       if (samdb_msg_add_logon_hours(a_state->sam_ctx, mem_ctx, msg, attr, r->in.info->field) != 0) { \
+       if (samdb_msg_add_logon_hours(a_state->sam_ctx, mem_ctx, msg, attr, &r->in.info->field) != 0) { \
                return NT_STATUS_NO_MEMORY; \
        } \
 } while (0)

diff --git a/source4/rpc_server/samr/samdb.c b/source4/rpc_server/samr/samdb.c
index 3fb8fcef1e5f0a219e889f132ee7f3c269a437ef..15796a695e3f7cf85ffa3dd1cd4387a6cfb5c48e 100644 (file)
--- a/source4/rpc_server/samr/samdb.c
+++ b/source4/rpc_server/samr/samdb.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_netlogon.h"
 
 /*
   connect to the SAM database
@@ -789,12 +790,12 @@ int samdb_msg_add_acct_flags(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message
   add a logon_hours element to a message
 */
 int samdb_msg_add_logon_hours(void *ctx, TALLOC_CTX *mem_ctx, struct ldb_message *msg,
-                             const char *attr_name, struct samr_LogonHours hours)
+                             const char *attr_name, struct samr_LogonHours *hours)
 {
        struct ldb_wrap *sam_ctx = ctx;
        struct ldb_val val;
-       val.length = hours.units_per_week / 8;
-       val.data = hours.bitmap;
+       val.length = hours->units_per_week / 8;
+       val.data = hours->bitmap;
        ldb_set_alloc(sam_ctx->ldb, talloc_realloc_fn, mem_ctx);
        return ldb_msg_add_value(sam_ctx->ldb, msg, attr_name, &val);
 }

diff --git a/source4/smb_server/negprot.c b/source4/smb_server/negprot.c
index 030ccf8fa3e3f230a8e21feadf017a31ebf25981..aa809664a124065ee540dc790f9ee4331bf4a750 100644 (file)
--- a/source4/smb_server/negprot.c
+++ b/source4/smb_server/negprot.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 /* initialise the auth_context for this server and return the cryptkey */
 static void get_challenge(struct smbsrv_connection *smb_conn, char buff[8]) 

diff --git a/source4/smb_server/sesssetup.c b/source4/smb_server/sesssetup.c
index 7aaec90f13b99d8a8b8ae210c236e6d5ad7fb4b4..c3d378f0e39c0956a26ec28320ff4810b76877e4 100644 (file)
--- a/source4/smb_server/sesssetup.c
+++ b/source4/smb_server/sesssetup.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 /*
   setup the OS, Lanman and domain portions of a session setup reply

diff --git a/source4/smbd/server.c b/source4/smbd/server.c
index 40ec69c3b9a6b808db8560e8df2336b8b72f14b7..830d26fa7f99357f957fb20893ec5fd89e63bcf4 100644 (file)
--- a/source4/smbd/server.c
+++ b/source4/smbd/server.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 
 static void exit_server(const char *reason)
 {

diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c
index e98fe789b81eec18c71a3ab0ee77a4319090a81d..5d8db9030dd9575aba3a6abc70805c79d9ca1960 100644 (file)
--- a/source4/torture/auth/ntlmssp.c
+++ b/source4/torture/auth/ntlmssp.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "auth/auth.h"
 
 BOOL torture_ntlmssp_self_check(void) 
 {

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 6971193f92ccf18120055eea5818eef7991eb584..6d81b774d8d141f888ba7953f444270f97e49412 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -24,6 +24,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "auth/auth.h"
 
 
 static const char *machine_password;

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index 969e68265d83bd784ef4b4b1769ce32a51da8055..62b69ea8fb01f2a768c98e2d1d606e44b8f1137e 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 

diff --git a/source4/utils/ndrdump.c b/source4/utils/ndrdump.c
index d408433fc3908f3762cc283978ed4a8134313de6..a4182281c82cd65d308f4b58be43f9f1e63962af 100644 (file)
--- a/source4/utils/ndrdump.c
+++ b/source4/utils/ndrdump.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 #include "system/iconv.h"
 
 static const struct dcerpc_interface_table *find_pipe(const char *pipe_name)

diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index ce817309cc192899c0ae1356526e20db6a6557d9..5a4ececa5be38d3c194d052018489b51df894800 100644 (file)
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -42,6 +42,7 @@
 /*****************************************************/
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
 
 /*
   run a function from a function table. If not found then

diff --git a/source4/utils/ntlm_auth.c b/source4/utils/ntlm_auth.c
index e83aa76cf4963c52b2811777c1f66ee247cdf195..060e590d15b25fc2780adb44fc49f0048dbaa3e9 100644 (file)
--- a/source4/utils/ntlm_auth.c
+++ b/source4/utils/ntlm_auth.c
@@ -23,6 +23,8 @@
 */
 
 #include "includes.h"
+#include "lib/cmdline/popt_common.h"
+#include "auth/auth.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_WINBIND