- a few portability fixes from Jim Myers

- added SMBD_LISTEN_BACKLOG in local.h

- added the beginnings of a ndr/rpc parsing framework for Samba4. It
  currently correctly parses security descriptors for the nttrans
  QUERY_SECDESC call, but I hope it will become a reasonable framework
  that an idl based generator can work to
(This used to be commit 9bf904fc34f88e0581f93656e73d3c01ca96f761)

3 files changed, 11 insertions, 3 deletions

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 11f6a14df9..39b589a49d 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -776,6 +776,9 @@ extern int errno;
 
 #include "mutex.h"
 
+#include "libcli/rpc/librpc.h"
+#include "libcli/rpc/rpc_sec.h"
+
 /*
  * Type for wide character dirent structure.
  * Only d_name is defined by POSIX.
diff --git a/source4/include/local.h b/source4/include/local.h
index 4515bd83e0..57aac01ca8 100644
--- a/source4/include/local.h
+++ b/source4/include/local.h
@@ -223,4 +223,8 @@
 
 /* Max number of simultaneous winbindd socket connections. */
 #define WINBINDD_MAX_SIMULTANEOUS_CLIENTS 200
+
+/* size of listen() backlog in smbd */
+#define SMBD_LISTEN_BACKLOG 10
+
 #endif
diff --git a/source4/include/smb_interfaces.h b/source4/include/smb_interfaces.h
index 5f96679900..77b73ecd7c 100644
--- a/source4/include/smb_interfaces.h
+++ b/source4/include/smb_interfaces.h
@@ -41,15 +41,15 @@ typedef struct nttime_info
    on the wire in testsuite test code to ensure that we are
    terminating names in the same way that win2003 is. The *ONLY* time
    you should ever look at the 'private_length' field in this
-   structure is inside compliance test code, in all cases just use the
-   null terminated char* as the definitive definition of the
+   structure is inside compliance test code, in all other cases just
+   use the null terminated char* as the definitive definition of the
    string
 
    also note that this structure is only used in packets where there
    is an explicit length provided on the wire (hence the name). That
    length is placed in 'private_length'. For packets where the length
    is always determined by NULL or packet termination a normal char*
-   is used.
+   is used in the structure definition.
  */
 typedef struct {
 	uint32 private_length;
@@ -1916,3 +1916,4 @@ union smb_search_close {
 	} findclose;
 };
 
+