r5298: - got rid of pstring.h from includes.h. This at least makes it a bit

   less likely that anyone will use pstring for new code

 - got rid of winbind_client.h from includes.h. This one triggered a
   huge change, as winbind_client.h was including system/filesys.h and
   defining the old uint32 and uint16 types, as well as its own
   pstring and fstring.

diff --git a/source/auth/auth_developer.c b/source/auth/auth_developer.c
index 6bb015ad351bccbd781d83cd7ced84c60304a0fa..fe0eb12cdedd1008a88ddede483afd41b18765e0 100644 (file)
--- a/source/auth/auth_developer.c
+++ b/source/auth/auth_developer.c
@@ -24,6 +24,7 @@
 #include "auth/auth.h"
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "pstring.h"
 
 /** 
  * Return an error based on username

diff --git a/source/auth/auth_sam.c b/source/auth/auth_sam.c
index 44a8b19cae1e06c9c15af836694fcfc0f501a03c..2a2a437ded05503c751b8d0d943bb1d3cd5ac13e 100644 (file)
--- a/source/auth/auth_sam.c
+++ b/source/auth/auth_sam.c
@@ -25,6 +25,7 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/ldb/include/ldb.h"
+#include "pstring.h"
 
 /****************************************************************************
  Do a specific test for an smb password being correct, given a smb_password and

diff --git a/source/auth/auth_winbind.c b/source/auth/auth_winbind.c
index 2ded310ebc308866ab8cc065fc910919311614ed..8a6a5a720bf6cb055ce84578dcf5de2226c7a76a 100644 (file)
--- a/source/auth/auth_winbind.c
+++ b/source/auth/auth_winbind.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "auth/auth.h"
+#include "nsswitch/winbind_client.h"
 
 static NTSTATUS get_info3_from_ndr(TALLOC_CTX *mem_ctx, struct winbindd_response *response, struct netr_SamInfo3 *info3)
 {

diff --git a/source/build/pidl/server.pm b/source/build/pidl/server.pm
index e080bf56547011606bf53c4ff42221b5d34681f1..46dada7c7f9a543b41c73116409721ecddc84829 100644 (file)
--- a/source/build/pidl/server.pm
+++ b/source/build/pidl/server.pm
@@ -103,7 +103,7 @@ static void $name\__op_unbind(struct dcesrv_connection_context *context, const s
 static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_pull *pull, void **r)
 {
        NTSTATUS status;
-       uint16 opnum = dce_call->pkt.u.request.opnum;
+       uint16_t opnum = dce_call->pkt.u.request.opnum;
 
        dce_call->fault_code = 0;
 
@@ -129,7 +129,7 @@ static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_C
 
 static NTSTATUS $name\__op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r)
 {
-       uint16 opnum = dce_call->pkt.u.request.opnum;
+       uint16_t opnum = dce_call->pkt.u.request.opnum;
 
        switch (opnum) {
 ";
@@ -152,7 +152,7 @@ pidl "
 
 static NTSTATUS $name\__op_reply(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r)
 {
-       uint16 opnum = dce_call->pkt.u.request.opnum;
+       uint16_t opnum = dce_call->pkt.u.request.opnum;
 
        switch (opnum) {
 ";
@@ -176,7 +176,7 @@ pidl "
 static NTSTATUS $name\__op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_push *push, void *r)
 {
        NTSTATUS status;
-       uint16 opnum = dce_call->pkt.u.request.opnum;
+       uint16_t opnum = dce_call->pkt.u.request.opnum;
 
        status = dcerpc_table_$name.calls[opnum].ndr_push(push, NDR_OUT, r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -229,7 +229,7 @@ static NTSTATUS $name\__op_init_server(struct dcesrv_context *dce_ctx, const str
        return NT_STATUS_OK;
 }
 
-static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32 if_version)
+static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32_t if_version)
 {
        if ($name\_interface.if_version == if_version &&
                strcmp($name\_interface.uuid, uuid)==0) {

diff --git a/source/build/pidl/stub.pm b/source/build/pidl/stub.pm
index a9c938df63b1ffe9731d49a66f7d574abb1618ce..53be35b216002105c1ff380648cc53d1c92bfb5a 100644 (file)
--- a/source/build/pidl/stub.pm
+++ b/source/build/pidl/stub.pm
@@ -107,7 +107,7 @@ static void $name\__op_unbind(struct dcesrv_connection_context *context, const s
 static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_pull *pull, void **r)
 {
        NTSTATUS status;
-       uint16 opnum = dce_call->pkt.u.request.opnum;
+       uint16_t opnum = dce_call->pkt.u.request.opnum;
 
        dce_call->fault_code = 0;
 
@@ -133,7 +133,7 @@ static NTSTATUS $name\__op_ndr_pull(struct dcesrv_call_state *dce_call, TALLOC_C
 
 static NTSTATUS $name\__op_dispatch(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r)
 {
-       uint16 opnum = dce_call->pkt.u.request.opnum;
+       uint16_t opnum = dce_call->pkt.u.request.opnum;
        struct GUID ipid = dce_call->pkt.u.request.object.object;
        struct dcom_interface_p *iface = dcom_get_local_iface_p(&ipid);
        const struct dcom_$name\_vtable *vtable = iface->vtable;
@@ -159,7 +159,7 @@ pidl "
 
 static NTSTATUS $name\__op_reply(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, void *r)
 {
-       uint16 opnum = dce_call->pkt.u.request.opnum;
+       uint16_t opnum = dce_call->pkt.u.request.opnum;
 
        switch (opnum) {
 ";
@@ -183,7 +183,7 @@ pidl "
 static NTSTATUS $name\__op_ndr_push(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct ndr_push *push, void *r)
 {
        NTSTATUS status;
-       uint16 opnum = dce_call->pkt.u.request.opnum;
+       uint16_t opnum = dce_call->pkt.u.request.opnum;
 
        status = dcerpc_table_$name.calls[opnum].ndr_push(push, NDR_OUT, r);
        if (!NT_STATUS_IS_OK(status)) {
@@ -236,7 +236,7 @@ static NTSTATUS $name\__op_init_server(struct dcesrv_context *dce_ctx, const str
        return NT_STATUS_OK;
 }
 
-static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32 if_version)
+static BOOL $name\__op_interface_by_uuid(struct dcesrv_interface *iface, const char *uuid, uint32_t if_version)
 {
        if (dcerpc_table_$name.if_version == if_version &&
                strcmp(dcerpc_table_$name.uuid, uuid)==0) {

diff --git a/source/dsdb/samdb/samdb.c b/source/dsdb/samdb/samdb.c
index a4f200c33f56ca9cf0f8c68510038102405cef17..1af80c12bdd0c1a58302784b6286294d39214616 100644 (file)
--- a/source/dsdb/samdb/samdb.c
+++ b/source/dsdb/samdb/samdb.c
@@ -24,6 +24,7 @@
 #include "librpc/gen_ndr/ndr_netlogon.h"
 #include "lib/ldb/include/ldb.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 /*
   connect to the SAM database
@@ -551,7 +552,7 @@ struct samr_LogonHours samdb_result_logon_hours(TALLOC_CTX *mem_ctx, struct ldb_
        const int units_per_week = 168;
        const struct ldb_val *val = ldb_msg_find_ldb_val(msg, attr);
        ZERO_STRUCT(hours);
-       hours.bits = talloc_array(mem_ctx, uint8, units_per_week);
+       hours.bits = talloc_array(mem_ctx, uint8_t, units_per_week);
        if (!hours.bits) {
                return hours;
        }

diff --git a/source/dynconfig.c b/source/dynconfig.c
index cbe9ea49cea5ec00dae0018cfba42a51dc7b9fa5..c76d448b8cdd006c7147b5cec59a970462b34de4 100644 (file)
--- a/source/dynconfig.c
+++ b/source/dynconfig.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "pstring.h"
 
 /**
  * @file dynconfig.c

diff --git a/source/include/dynconfig.h b/source/include/dynconfig.h
index 48e02c078a3eca17f0f429bcad801639c07cb362..a95e67a90dbdab2a7860bf3105526c92103c5b6c 100644 (file)
--- a/source/include/dynconfig.h
+++ b/source/include/dynconfig.h
@@ -25,6 +25,8 @@
  * @brief Exported global configurations.
  **/
 
+#include "pstring.h"
+
 extern char const *dyn_SBINDIR,
        *dyn_BINDIR;
 

diff --git a/source/include/includes.h b/source/include/includes.h
index cef5e982c7e540dc3f166690ca620ce8d49f4067..890491f8844c58f8530f51cf384037355fce504d 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -120,7 +120,6 @@ extern int errno;
 #include "debug.h"
 #include "doserr.h"
 #include "enums.h"
-#include "pstring.h"
 #include "smb_macros.h"
 #include "smb.h"
 #include "lib/socket/socket.h"
@@ -137,7 +136,6 @@ extern int errno;
 #include "smb_interfaces.h"
 #include "ntvfs/ntvfs.h"
 #include "cli_context.h"
-#include "nsswitch/winbind_client.h"
 #include "ads.h"
 
 #define malloc_p(type) (type *)malloc(sizeof(type))

diff --git a/source/include/pstring.h b/source/include/pstring.h
index 5bd03ec0d8f89dc6b6600b3f247efd67f40806aa..3683849686589fc085c953c26916920d6fc52a71 100644 (file)
--- a/source/include/pstring.h
+++ b/source/include/pstring.h
@@ -25,6 +25,8 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#ifndef _PSTRING
+
 #define PSTRING_LEN 1024
 #define FSTRING_LEN 256
 
@@ -32,3 +34,4 @@ typedef char pstring[PSTRING_LEN];
 typedef char fstring[FSTRING_LEN];
 
 #define _PSTRING
+#endif

diff --git a/source/include/rap.h b/source/include/rap.h
index 0477192d9e7f5e3f2e8021b61fd516be38f67c16..c831f6f0079e53eb507ddfd20d1fe1919ac4844b 100644 (file)
--- a/source/include/rap.h
+++ b/source/include/rap.h
@@ -286,7 +286,7 @@ struct rap_shareenum_info_0 {
 struct rap_shareenum_info_1 {
        char name[13];
        char pad;
-       uint16 type;
+       uint16_t type;
        char *comment;
 };
 
@@ -297,15 +297,15 @@ union rap_shareenum_info {
 
 struct rap_NetShareEnum {
        struct {
-               uint16 level;
-               uint16 bufsize;
+               uint16_t level;
+               uint16_t bufsize;
        } in;
 
        struct {
-               uint16 status;
-               uint16 convert;
-               uint16 count;
-               uint16 available;
+               uint16_t status;
+               uint16_t convert;
+               uint16_t count;
+               uint16_t available;
                union rap_shareenum_info *info;
        } out;
 };
@@ -329,17 +329,17 @@ union rap_server_info {
 
 struct rap_NetServerEnum2 {
        struct {
-               uint16 level;
-               uint16 bufsize;
-               uint32 servertype;
+               uint16_t level;
+               uint16_t bufsize;
+               uint32_t servertype;
                const char *domain;
        } in;
 
        struct {
-               uint16 status;
-               uint16 convert;
-               uint16 count;
-               uint16 available;
+               uint16_t status;
+               uint16_t convert;
+               uint16_t count;
+               uint16_t available;
                union rap_server_info *info;
        } out;
 };

diff --git a/source/intl/lang_tdb.c b/source/intl/lang_tdb.c
index 660323682db141ec3282963ab5f79dca91a7e8d0..de08c82ce4e2a0d04e86b985e000f79e7e1fd826 100644 (file)
--- a/source/intl/lang_tdb.c
+++ b/source/intl/lang_tdb.c
@@ -21,6 +21,8 @@
 #include "includes.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
+#include "system/filesys.h"
+#include "pstring.h"
 
 static TDB_CONTEXT *tdb;
 

diff --git a/source/lib/charcnv.c b/source/lib/charcnv.c
index 4cf5d004657217ea3f29a78c940929ae71ecc57d..ea0fcd8d32f9e565b6c8f59d7be087b24ac0c987 100644 (file)
--- a/source/lib/charcnv.c
+++ b/source/lib/charcnv.c
@@ -22,6 +22,7 @@
 */
 #include "includes.h"
 #include "system/iconv.h"
+#include "pstring.h"
 
 /**
  * @file

diff --git a/source/lib/cmdline/popt_common.h b/source/lib/cmdline/popt_common.h
index 06560d2be58b951bd86c9789b9eb61bfbb90f914..d6ae43d08376ede0ab6e0e86fca84cc7f3cb3c28 100644 (file)
--- a/source/lib/cmdline/popt_common.h
+++ b/source/lib/cmdline/popt_common.h
@@ -22,6 +22,7 @@
 #define _POPT_COMMON_H
 
 #include "popt.h"
+#include "pstring.h"
 
 /* Common popt structures */
 extern struct poptOption popt_common_samba[];

diff --git a/source/lib/cmdline/readline.c b/source/lib/cmdline/readline.c
index 8836759f70bdb6cb461e02bb0a9d68a6e1a9c415..4970638d41f9d419154461f1640bc5df17ffce0e 100644 (file)
--- a/source/lib/cmdline/readline.c
+++ b/source/lib/cmdline/readline.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "pstring.h"
 
 #include <unistd.h>
 

diff --git a/source/lib/dcom/common/main.c b/source/lib/dcom/common/main.c
index 01906501f1f07f460cf2509b3b2d13d7870c5a40..a8324606f1014d66f74e785fbc93feb41dc1d9f1 100644 (file)
--- a/source/lib/dcom/common/main.c
+++ b/source/lib/dcom/common/main.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dlinklist.h"
 #include "librpc/gen_ndr/ndr_epmapper.h"
 #include "librpc/gen_ndr/ndr_remact.h"
@@ -145,7 +146,7 @@ WERROR dcom_ping(struct dcom_context *ctx)
 
 static WERROR dcom_create_object_remote(struct dcom_context *ctx, struct GUID *clsid, const char *server, int num_ifaces, struct GUID *iid, struct dcom_interface_p ***ip, WERROR *results)
 {
-       uint16 protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
+       uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
        struct dcerpc_pipe *p;
        struct dcom_object_exporter *m;
        NTSTATUS status;
@@ -268,7 +269,7 @@ WERROR dcom_get_class_object_remote(struct dcom_context *ctx, struct GUID *clsid
        struct DUALSTRINGARRAY dualstring;
        NTSTATUS status;
        struct pMInterfacePointer pm;
-       uint16 protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
+       uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
 
        status = dcom_connect_host(ctx, &p, server);
        if (NT_STATUS_IS_ERR(status)) {
@@ -498,7 +499,7 @@ NTSTATUS dcom_ifacep_from_OBJREF(struct dcom_context *ctx, struct dcom_interface
        if (!m) {
                struct dcerpc_pipe *po;
                struct ResolveOxid r;
-               uint16 protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
+               uint16_t protseq[] = DCOM_NEGOTIATED_PROTOCOLS;
 
                DEBUG(3, ("No binding data present yet, resolving OXID %llu\n", p->ox->oxid));
 

diff --git a/source/lib/debug.c b/source/lib/debug.c
index f1e9cec38e8b39aff77ff230015611d2d5d1209a..ab012a98aa24d7923ec3253967140b2989834701 100644 (file)
--- a/source/lib/debug.c
+++ b/source/lib/debug.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dynconfig.h"
 
 /* this global variable determines what messages are printed */

diff --git a/source/lib/events/events.c b/source/lib/events/events.c
index 140e3ff06715cfbc1f0c10ddc29c8041f8b00b5e..34606273995bccde2e9309795a3213ce31ba299a 100644 (file)
--- a/source/lib/events/events.c
+++ b/source/lib/events/events.c
@@ -57,6 +57,7 @@
 #include "includes.h"
 #include "system/time.h"
 #include "system/select.h"
+#include "system/filesys.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
 

diff --git a/source/lib/fault.c b/source/lib/fault.c
index d90281f950c9d74b89b3ee3b9dd9cc732bbd3992..9f1e3f44bc0a22129860a70e4f27643e2f5c8518 100644 (file)
--- a/source/lib/fault.c
+++ b/source/lib/fault.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "version.h"
 #include "system/wait.h"
+#include "system/filesys.h"
 
 static void (*cont_fn)(void *);
 

diff --git a/source/lib/gencache.c b/source/lib/gencache.c
index 8688683e8d21706d7743b92d28c985ac63a357dd..1a6159942d84e47ed6ce152c2d11f10921d28913 100644 (file)
--- a/source/lib/gencache.c
+++ b/source/lib/gencache.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 #undef  DBGC_CLASS
 #define DBGC_CLASS DBGC_TDB

diff --git a/source/lib/genrand.c b/source/lib/genrand.c
index 0f1d02b71019b3b9f52dd0c9863499d0b861a882..e3df9f9d909fef6e38da15e57acec08f52989d70 100644 (file)
--- a/source/lib/genrand.c
+++ b/source/lib/genrand.c
@@ -22,10 +22,11 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "system/filesys.h"
 #include "lib/crypto/crypto.h"
 
 static unsigned char hash[258];
-static uint32 counter;
+static uint32_t counter;
 
 static BOOL done_reseed = False;
 static void (*reseed_callback)(int *newseed);
@@ -147,7 +148,7 @@ static void do_filehash(const char *fname, unsigned char *the_hash)
 static int do_reseed(BOOL use_fd, int fd)
 {
        unsigned char seed_inbuf[40];
-       uint32 v1, v2; struct timeval tval; pid_t mypid;
+       uint32_t v1, v2; struct timeval tval; pid_t mypid;
        int reseed_data = 0;
 
        if (use_fd) {

diff --git a/source/lib/iconv.c b/source/lib/iconv.c
index 181834d66aaeddb6c7f77bdbc1a0ea69db0ea057..df590444e58db5f1214f4355f73ff96ba601b0b2 100644 (file)
--- a/source/lib/iconv.c
+++ b/source/lib/iconv.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "dlinklist.h"
 #include "system/iconv.h"
+#include "system/filesys.h"
 
 
 /**

diff --git a/source/lib/ldb/ldb_tdb/ldb_tdb.h b/source/lib/ldb/ldb_tdb/ldb_tdb.h
index 0c644ffe5e4f1daa55f6f0246d8c6dec0f0ca6a2..4c2fc52f7c8f1ee9206f16189a646fb83e85b846 100644 (file)
--- a/source/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -1,5 +1,6 @@
 
 #ifdef _SAMBA_BUILD_
+#include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
 #else
 #include "tdb.h"

diff --git a/source/lib/ldb/tools/ldbadd.c b/source/lib/ldb/tools/ldbadd.c
index d95036497ad789af92fd0584606f6b2b0f252890..927debc65e250e9b4625b72df85e15cf3a8316f7 100644 (file)
--- a/source/lib/ldb/tools/ldbadd.c
+++ b/source/lib/ldb/tools/ldbadd.c
@@ -36,6 +36,10 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
 
+#ifdef _SAMBA_BUILD_
+#include "system/filesys.h"
+#endif
+
 static int failures;
 
 static void usage(void)

diff --git a/source/lib/ldb/tools/ldbdel.c b/source/lib/ldb/tools/ldbdel.c
index 29d3b397304b706cf32c04a07759c459292f668e..2241a0b82305657f73727988333e37365981f80b 100644 (file)
--- a/source/lib/ldb/tools/ldbdel.c
+++ b/source/lib/ldb/tools/ldbdel.c
@@ -36,6 +36,10 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
 
+#ifdef _SAMBA_BUILD_
+#include "system/filesys.h"
+#endif
+
 static int ldb_delete_recursive(struct ldb_context *ldb, const char *dn)
 {
        int ret, i, total=0;

diff --git a/source/lib/ldb/tools/ldbedit.c b/source/lib/ldb/tools/ldbedit.c
index 4c38ea6803b987656d90fafb7faa3c7fa2a4f010..20cb7da810b80b737eb8af6a06d84b358b5bd366 100644 (file)
--- a/source/lib/ldb/tools/ldbedit.c
+++ b/source/lib/ldb/tools/ldbedit.c
@@ -36,6 +36,10 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
 
+#ifdef _SAMBA_BUILD_
+#include "system/filesys.h"
+#endif
+
 static int verbose;
 
 /*

diff --git a/source/lib/ldb/tools/ldbmodify.c b/source/lib/ldb/tools/ldbmodify.c
index 3bdb946897e2ffb70262dce3143a7e480a1529c8..97dec1050e7bb001f897ffeb37ffe3c01c86b40a 100644 (file)
--- a/source/lib/ldb/tools/ldbmodify.c
+++ b/source/lib/ldb/tools/ldbmodify.c
@@ -36,6 +36,10 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
 
+#ifdef _SAMBA_BUILD_
+#include "system/filesys.h"
+#endif
+
 static int failures;
 
 static void usage(void)

diff --git a/source/lib/ldb/tools/ldbrename.c b/source/lib/ldb/tools/ldbrename.c
index 3ee001cf23f02bc0e6de1bebc9919a18a2f020a5..ba870b0a457c265a7368bd1958e70a74530571cb 100644 (file)
--- a/source/lib/ldb/tools/ldbrename.c
+++ b/source/lib/ldb/tools/ldbrename.c
@@ -38,6 +38,10 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
 
+#ifdef _SAMBA_BUILD_
+#include "system/filesys.h"
+#endif
+
 static void usage(void)
 {
        printf("Usage: ldbrename [<options>] <olddn> <newdn>\n");

diff --git a/source/lib/ldb/tools/ldbsearch.c b/source/lib/ldb/tools/ldbsearch.c
index 5e0246d7a93d246356cee4b3a43c0c3f27684f80..f764b2855794e4f8f73e490139aa1668d3d1f08f 100644 (file)
--- a/source/lib/ldb/tools/ldbsearch.c
+++ b/source/lib/ldb/tools/ldbsearch.c
@@ -36,6 +36,10 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
 
+#ifdef _SAMBA_BUILD_
+#include "system/filesys.h"
+#endif
+
 static void usage(void)
 {
        printf("Usage: ldbsearch <options> <expression> <attrs...>\n");

diff --git a/source/lib/ldb/tools/ldbtest.c b/source/lib/ldb/tools/ldbtest.c
index 01fa1b8ed7a3a8b6357302bc590fae9ee4877d1e..67630d445839757b064418f5dd06b3c089abf469 100644 (file)
--- a/source/lib/ldb/tools/ldbtest.c
+++ b/source/lib/ldb/tools/ldbtest.c
@@ -36,6 +36,10 @@
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
 
+#ifdef _SAMBA_BUILD_
+#include "system/filesys.h"
+#endif
+
 static const char *ldb_url;
 static const char *base_dn = "ou=Ldb Test,ou=People,o=University of Michigan,c=US";
 

diff --git a/source/lib/messaging/messaging.c b/source/lib/messaging/messaging.c
index aab13ba8af932b25bb9778ba131b9351f999362a..df0216617d0b3b19caf7a7f09bcfdf58fa41d9c9 100644 (file)
--- a/source/lib/messaging/messaging.c
+++ b/source/lib/messaging/messaging.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/events/events.h"
+#include "system/filesys.h"
 #include "system/time.h"
 #include "messages.h"
 #include "dlinklist.h"

diff --git a/source/lib/pidfile.c b/source/lib/pidfile.c
index f8041a20050983921b043c98912b3c166f110bfe..ff05c0606e411272a72640d85279c6abc5a74f7e 100644 (file)
--- a/source/lib/pidfile.c
+++ b/source/lib/pidfile.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "pstring.h"
+#include "system/filesys.h"
 
 #ifndef O_NONBLOCK
 #define O_NONBLOCK

diff --git a/source/lib/registry/reg_backend_dir.c b/source/lib/registry/reg_backend_dir.c
index bac0f43c20da8bc08a7dfe8092da63674e32c411..68f02d17459fb9c501ec8b6f415a1ea98f5b72cc 100644 (file)
--- a/source/lib/registry/reg_backend_dir.c
+++ b/source/lib/registry/reg_backend_dir.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "registry.h"
 #include "system/dir.h"
+#include "system/filesys.h"
 
 static WERROR reg_dir_add_key(TALLOC_CTX *mem_ctx, struct registry_key *parent, const char *name, uint32_t access_mask, struct security_descriptor *desc, struct registry_key **result)
 {

diff --git a/source/lib/registry/reg_backend_ldb.c b/source/lib/registry/reg_backend_ldb.c
index 930ea9642e09f577cbab35f6c2c7deb79dfc6054..c7b7bf587f59b5a9f5075b83c73f671de7663ea6 100644 (file)
--- a/source/lib/registry/reg_backend_ldb.c
+++ b/source/lib/registry/reg_backend_ldb.c
@@ -36,7 +36,7 @@ static int ldb_close_hive (void *_hive)
        return 0;
 }
 
-static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, struct ldb_message *msg, char **name, uint32 *type, void **data, int *len)
+static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, struct ldb_message *msg, char **name, uint32_t *type, void **data, int *len)
 {
        const struct ldb_val *val;
        *name = talloc_strdup(mem_ctx, ldb_msg_find_string(msg, "value", NULL));
@@ -52,7 +52,7 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, struct ldb_message *msg, c
 
        case REG_DWORD_LE:
                *len = 4;
-               *data = talloc(mem_ctx, uint32);
+               *data = talloc(mem_ctx, uint32_t);
                SIVAL(*data, 0, strtol(val->data, NULL, 0));
                break;
 
@@ -63,7 +63,7 @@ static void reg_ldb_unpack_value(TALLOC_CTX *mem_ctx, struct ldb_message *msg, c
        }
 }
 
-static struct ldb_message *reg_ldb_pack_value(struct ldb_context *ctx, TALLOC_CTX *mem_ctx, const char *name, uint32 type, void *data, int len)
+static struct ldb_message *reg_ldb_pack_value(struct ldb_context *ctx, TALLOC_CTX *mem_ctx, const char *name, uint32_t type, void *data, int len)
 {
        struct ldb_val val;
        struct ldb_message *msg = talloc_zero(mem_ctx, struct ldb_message);
@@ -322,7 +322,7 @@ static WERROR ldb_del_value (struct registry_key *key, const char *child)
        return WERR_OK;
 }
 
-static WERROR ldb_set_value (struct registry_key *parent, const char *name, uint32 type, void *data, int len)
+static WERROR ldb_set_value (struct registry_key *parent, const char *name, uint32_t type, void *data, int len)
 {
        struct ldb_context *ctx = parent->hive->backend_data;
        struct ldb_message *msg;

diff --git a/source/lib/registry/reg_backend_rpc.c b/source/lib/registry/reg_backend_rpc.c
index d2809f644a2b399de35be7425ea58c34786e3b1e..230241655455745f618e8b225dfe6ad68a6e1d7b 100644 (file)
--- a/source/lib/registry/reg_backend_rpc.c
+++ b/source/lib/registry/reg_backend_rpc.c
@@ -78,7 +78,7 @@ struct rpc_key_data {
 };
 
 struct {
-       uint32 hkey;
+       uint32_t hkey;
        WERROR (*open) (struct dcerpc_pipe *p, TALLOC_CTX *, struct policy_handle *h);
 } known_hives[] = {
 { HKEY_LOCAL_MACHINE, open_HKLM },
@@ -93,7 +93,7 @@ struct {
 
 static WERROR rpc_query_key(struct registry_key *k);
 
-static WERROR rpc_get_predefined_key (struct registry_context *ctx, uint32 hkey_type, struct registry_key **k)
+static WERROR rpc_get_predefined_key (struct registry_context *ctx, uint32_t hkey_type, struct registry_key **k)
 {
        int n;
        struct registry_hive *h;
@@ -185,7 +185,7 @@ static WERROR rpc_get_value_by_index(TALLOC_CTX *mem_ctx, struct registry_key *p
        struct rpc_key_data *mykeydata = parent->backend_data;
        WERROR error;
        struct winreg_EnumValue r;
-       uint32 type, len1, zero = 0;
+       uint32_t type, len1, zero = 0;
        NTSTATUS status;
        uint8_t buf8;
        uint16_t buf16;

diff --git a/source/lib/registry/reg_samba.c b/source/lib/registry/reg_samba.c
index a81b9e5a425e4918a7c1e53aad285d50b832037d..7188109daa83bca8a49701094fe654b1afe86ec2 100644 (file)
--- a/source/lib/registry/reg_samba.c
+++ b/source/lib/registry/reg_samba.c
@@ -23,7 +23,7 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY
 
-static WERROR reg_samba_get_predef (struct registry_context *ctx, uint32 hkey, struct registry_key **k)
+static WERROR reg_samba_get_predef (struct registry_context *ctx, uint32_t hkey, struct registry_key **k)
 {
        WERROR error;
        const char *conf;

diff --git a/source/lib/select.c b/source/lib/select.c
index 5d7e4a0ad2a827f1de8329bf7eb8904cbc5aa2c6..bed02304cc8606018d9bdd2806292ad98cbc0015 100644 (file)
--- a/source/lib/select.c
+++ b/source/lib/select.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /* This is here because it allows us to avoid a nasty race in signal handling. 
    We need to guarantee that when we get a signal we get out of a select immediately

diff --git a/source/lib/socket/socket.c b/source/lib/socket/socket.c
index 97176ea15045b4bc198a14ff4e22ed566ad2a8d3..109a7cadc01750101ef906c828d7ae046cfbaf99 100644 (file)
--- a/source/lib/socket/socket.c
+++ b/source/lib/socket/socket.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 /*
   auto-close sockets on free

diff --git a/source/lib/socket/socket_ipv4.c b/source/lib/socket/socket_ipv4.c
index 09a4b4a73a87b16e267a363cc49d2b964dc3571a..2a212fbc944bc8e4012090f33d1a0f7f52746955 100644 (file)
--- a/source/lib/socket/socket_ipv4.c
+++ b/source/lib/socket/socket_ipv4.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/filesys.h"
 
 static NTSTATUS ipv4_init(struct socket_context *sock)
 {

diff --git a/source/lib/socket/socket_ipv6.c b/source/lib/socket/socket_ipv6.c
index f5cd756259a0783224d82b8ae387d0ade14b087d..d7241d9b383c1af9624e814b4f3abd83018c9838 100644 (file)
--- a/source/lib/socket/socket_ipv6.c
+++ b/source/lib/socket/socket_ipv6.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/filesys.h"
 
 static struct in6_addr interpret_addr6(const char *name)
 {

diff --git a/source/lib/socket/socket_unix.c b/source/lib/socket/socket_unix.c
index e23aa0d97e9a55c169767ac699ea6fa4d73b18cd..2bcce0eb118c6c5ef4df4c598f8ffdbf9af50ba2 100644 (file)
--- a/source/lib/socket/socket_unix.c
+++ b/source/lib/socket/socket_unix.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/filesys.h"
 
 
 

diff --git a/source/lib/system.c b/source/lib/system.c
index b23529f5fe0d5f409306beefea5b357b2978bc8f..eb3799c7cad8cd95df57a64beb423f79c4263647 100644 (file)
--- a/source/lib/system.c
+++ b/source/lib/system.c
@@ -23,6 +23,7 @@
 #include "system/network.h"
 #include "system/wait.h"
 #include "system/filesys.h"
+#include "pstring.h"
 
 /*
    The idea is that this file will eventually have wrappers around all

diff --git a/source/lib/tdb/common/spinlock.c b/source/lib/tdb/common/spinlock.c
index 001f0c3bc11b14af046d8590ac97a70e7b18f940..232cd8dfc6a61e8125d2d475d6e8cbfdbf475321 100644 (file)
--- a/source/lib/tdb/common/spinlock.c
+++ b/source/lib/tdb/common/spinlock.c
@@ -43,6 +43,7 @@
 #else
 #include "includes.h"
 #include "lib/tdb/include/tdb.h"
+#include "system/filesys.h"
 #endif
 
 #ifdef USE_SPINLOCKS

diff --git a/source/lib/tdb/common/tdbutil.c b/source/lib/tdb/common/tdbutil.c
index 02a1d66cbe93e35e0a563c819a675c690b1192df..e3c56410544190f3cced309e6d6d5ba6bed00709 100644 (file)
--- a/source/lib/tdb/common/tdbutil.c
+++ b/source/lib/tdb/common/tdbutil.c
@@ -22,7 +22,9 @@
 #include "lib/tdb/include/tdbutil.h"
 #include "system/glob.h"
 #include "system/wait.h"
+#include "system/filesys.h"
 #include "dlinklist.h"
+#include "pstring.h"
 
 /* these are little tdb utility functions that are meant to make
    dealing with a tdb database a little less cumbersome in Samba */

diff --git a/source/lib/tdb/tools/tdbdump.c b/source/lib/tdb/tools/tdbdump.c
index 8aa573ca9b65eb52cecfd2b0ebb4294aaf9f5c62..774093dbc0ccb1752e6f2e91247753323f1d391e 100644 (file)
--- a/source/lib/tdb/tools/tdbdump.c
+++ b/source/lib/tdb/tools/tdbdump.c
@@ -39,6 +39,7 @@
 #include "includes.h"
 #include "lib/tdb/include/tdb.h"
 #include "system/iconv.h"
+#include "system/filesys.h"
 
 #endif
 

diff --git a/source/lib/tdb/tools/tdbtorture.c b/source/lib/tdb/tools/tdbtorture.c
index 63b3b0d3818d85a6c6ab33227ae90d6775a2c9a1..7e8e77952c1f819e0f42d84c2346e1056c33ceac 100644 (file)
--- a/source/lib/tdb/tools/tdbtorture.c
+++ b/source/lib/tdb/tools/tdbtorture.c
@@ -24,6 +24,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/filesys.h"
 
 #endif
 

diff --git a/source/lib/unix_privs.c b/source/lib/unix_privs.c
index a57f4359d3bfe55b4435965046cb6c55f5480ec0..b59657b7d59a883c7b2a4ba3f730dd4f4259a88f 100644 (file)
--- a/source/lib/unix_privs.c
+++ b/source/lib/unix_privs.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 
 /*
   there are times when smbd needs to temporarily gain root privileges

diff --git a/source/lib/username.c b/source/lib/username.c
index 1c8e5aa2bb8446ba89e532fb83c7e14b23ca0e3c..55965a7980b5711e30c577c5548567735fa022ca 100644 (file)
--- a/source/lib/username.c
+++ b/source/lib/username.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "pstring.h"
 
 /*****************************************************************
  Splits passed user or group name to domain and user/group name parts

diff --git a/source/lib/util.c b/source/lib/util.c
index dba2dbfe879302119e6280e2ebdb56fd9eb886f2..af41a20aa57a8bb3a2418033cf7bb68313e879be 100644 (file)
--- a/source/lib/util.c
+++ b/source/lib/util.c
@@ -26,6 +26,7 @@
 #include "dynconfig.h"
 #include "system/network.h"
 #include "system/iconv.h"
+#include "system/filesys.h"
 
 /**************************************************************************n
  Find a suitable temporary directory. The result should be copied immediately

diff --git a/source/lib/util_file.c b/source/lib/util_file.c
index 2b2fe2b2afcb0f275c34c9bf8fa2de79b6862d0a..6d234b571c7e4ca07715e1f0004953a73e2624e2 100644 (file)
--- a/source/lib/util_file.c
+++ b/source/lib/util_file.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "system/shmem.h"
+#include "system/filesys.h"
 
 /*************************************************************************
  gets a line out of a file.

diff --git a/source/lib/util_sock.c b/source/lib/util_sock.c
index b2f949ebe52e7a42e44a7ef2143c6ccb282f4815..d60fbb345133af5e62f08961bf4522bf0637829b 100644 (file)
--- a/source/lib/util_sock.c
+++ b/source/lib/util_sock.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "pstring.h"
 
 
 enum SOCK_OPT_TYPES {OPT_BOOL,OPT_INT,OPT_ON};

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index d9c4e30d6aecb6283ba9dbdde15241218937db66..dc39da50c7cadae8fc6786065ab9e9863691a576 100644 (file)
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -23,6 +23,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "pstring.h"
 
 /**
  * @file

diff --git a/source/libcli/auth/gensec_ntlmssp.c b/source/libcli/auth/gensec_ntlmssp.c
index 59bab6ced2eefaedff829f93f3ae6519c91c9ba3..524815382d6b5f03a1e1158198c6a52d7fc67e12 100644 (file)
--- a/source/libcli/auth/gensec_ntlmssp.c
+++ b/source/libcli/auth/gensec_ntlmssp.c
@@ -29,7 +29,7 @@ struct gensec_ntlmssp_state {
        struct auth_context *auth_context;
        struct auth_serversupplied_info *server_info;
        struct ntlmssp_state *ntlmssp_state;
-       uint32 have_features;
+       uint32_t have_features;
 };
 
 
@@ -470,7 +470,7 @@ static NTSTATUS gensec_ntlmssp_session_info(struct gensec_security *gensec_secur
 }
 
 static BOOL gensec_ntlmssp_have_feature(struct gensec_security *gensec_security,
-                                       uint32 feature)
+                                       uint32_t feature)
 {
        struct gensec_ntlmssp_state *gensec_ntlmssp_state = gensec_security->private_data;
        if (gensec_ntlmssp_state->have_features & feature) {

diff --git a/source/libcli/auth/ntlmssp.c b/source/libcli/auth/ntlmssp.c
index d5ddcfbfb62f48068441d3e0b1cbc0091f499d20..572ce66bb2e79c670d735430db18c5c2157918c3 100644 (file)
--- a/source/libcli/auth/ntlmssp.c
+++ b/source/libcli/auth/ntlmssp.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
+#include "pstring.h"
 
 static NTSTATUS ntlmssp_client_initial(struct ntlmssp_state *ntlmssp_state, 
                                       TALLOC_CTX *out_mem_ctx, 

diff --git a/source/libcli/auth/ntlmssp_parse.c b/source/libcli/auth/ntlmssp_parse.c
index 543f3d9b61d446d7d4b1af7a443e208896a42723..42546cb13083f6d871a60dbb890ad150253657be 100644 (file)
--- a/source/libcli/auth/ntlmssp_parse.c
+++ b/source/libcli/auth/ntlmssp_parse.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "pstring.h"
 
 /*
   this is a tiny msrpc packet generator. I am only using this to

diff --git a/source/libcli/auth/smbencrypt.c b/source/libcli/auth/smbencrypt.c
index 7e2890272cce08d8ffa4bf0ec426869e3ed4b8f5..00a28a1ad97f246b37c951d92d89fd64c919d1f8 100644 (file)
--- a/source/libcli/auth/smbencrypt.c
+++ b/source/libcli/auth/smbencrypt.c
@@ -26,6 +26,7 @@
 #include "system/time.h"
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
+#include "pstring.h"
 
 /*
    This implements the X/Open SMB password encryption

diff --git a/source/libcli/auth/spnego.c b/source/libcli/auth/spnego.c
index a61680c9d4bbc5e30bc18c89164b25b95be08272..39807671656d38c4e97901338b5d2c01537fba4d 100644 (file)
--- a/source/libcli/auth/spnego.c
+++ b/source/libcli/auth/spnego.c
@@ -844,7 +844,7 @@ static NTSTATUS gensec_spnego_update(struct gensec_security *gensec_security, TA
 }
 
 static BOOL gensec_spnego_have_feature(struct gensec_security *gensec_security,
-                                      uint32 feature) 
+                                      uint32_t feature) 
 {
        struct spnego_state *spnego_state = gensec_security->private_data;
        if (!spnego_state->sub_sec_security) {

diff --git a/source/libcli/ldap/ldap.c b/source/libcli/ldap/ldap.c
index 655838b64f01d4ec0f29649446ccdcb92d5b8403..545759c494db5402ecb0744c9d8ab6d6b34d0fd2 100644 (file)
--- a/source/libcli/ldap/ldap.c
+++ b/source/libcli/ldap/ldap.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "system/filesys.h"
 #include "asn_1.h"
 
 /****************************************************************************
@@ -697,7 +698,7 @@ static void ldap_decode_response(TALLOC_CTX *mem_ctx,
 static BOOL ldap_decode_filter(TALLOC_CTX *mem_ctx, struct asn1_data *data,
                               char **filter)
 {
-       uint8 filter_tag, tag_desc;
+       uint8_t filter_tag, tag_desc;
 
        if (!asn1_peek_uint8(data, &filter_tag))
                return False;
@@ -836,7 +837,7 @@ static void ldap_decode_attribs(TALLOC_CTX *mem_ctx, struct asn1_data *data,
 
 BOOL ldap_decode(struct asn1_data *data, struct ldap_message *msg)
 {
-       uint8 tag;
+       uint8_t tag;
 
        asn1_start_tag(data, ASN1_SEQUENCE(0));
        asn1_read_Integer(data, &msg->messageid);

diff --git a/source/libcli/ldap/ldap_client.c b/source/libcli/ldap/ldap_client.c
index 73099ec1be454cc4bae55d01e6ee9ee765d60ed6..ddf0932fa117a5645a218adc36795b75ec4c6e2c 100644 (file)
--- a/source/libcli/ldap/ldap_client.c
+++ b/source/libcli/ldap/ldap_client.c
@@ -25,6 +25,7 @@
 
 #include "includes.h"
 #include "system/network.h"
+#include "system/filesys.h"
 #include "auth/auth.h"
 #include "asn_1.h"
 #include "dlinklist.h"

diff --git a/source/libcli/raw/clisession.c b/source/libcli/raw/clisession.c
index 30382e08376bdbe5b12e34cf0525ba330bcbd20b..4eba4642742cd5baa975b703533fe79a45adc19a 100644 (file)
--- a/source/libcli/raw/clisession.c
+++ b/source/libcli/raw/clisession.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "system/filesys.h"
 #include "auth/auth.h"
 
 #define SETUP_REQUEST_SESSION(cmd, wct, buflen) do { \

diff --git a/source/libcli/resolve/host.c b/source/libcli/resolve/host.c
index cbf0f4614e591255e0fb807ede1c463cf9b9da45..9f48f83ba421274f9033626f0a20acc6fc0ee88d 100644 (file)
--- a/source/libcli/resolve/host.c
+++ b/source/libcli/resolve/host.c
@@ -32,6 +32,7 @@
 #include "includes.h"
 #include "lib/events/events.h"
 #include "system/network.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "libcli/composite/composite.h"
 

diff --git a/source/libcli/util/doserr.c b/source/libcli/util/doserr.c
index a584def829545b3af9c1a1486a5f70110850b148..b346fea6445b102786549c35cc69100637cd08e2 100644 (file)
--- a/source/libcli/util/doserr.c
+++ b/source/libcli/util/doserr.c
@@ -21,6 +21,7 @@
 /* DOS error codes.  please read doserr.h */
 
 #include "includes.h"
+#include "pstring.h"
 
 struct werror_code_struct {
        const char *dos_errstr;

diff --git a/source/libcli/util/nterr.c b/source/libcli/util/nterr.c
index 9317f0e37aebd99d866a5a8a1fc41cd5d2637219..d727cfe2a9e8f8bdf8ffbd73b6b20427f06da56d 100644 (file)
--- a/source/libcli/util/nterr.c
+++ b/source/libcli/util/nterr.c
@@ -21,6 +21,7 @@
 /* NT error codes.  please read nterr.h */
 
 #include "includes.h"
+#include "pstring.h"
 
 typedef struct
 {

diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index bf8524c495c99b768ab72cbde2cd9d484acf7a68..42c041aa83e839a7cec4d1c4b9054e5cfe4d319f 100644 (file)
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -64,8 +64,8 @@ static NTSTATUS libnet_JoinDomain_samr(struct libnet_context *ctx,
        struct samr_GetUserPwInfo pwp;
        struct samr_String samr_account_name;
 
-       uint32 acct_flags;
-       uint32 rid, access_granted;
+       uint32_t acct_flags;
+       uint32_t rid, access_granted;
        int policy_min_pw_len = 0;
 
        /* prepare connect to the SAMR pipe of users domain PDC */

diff --git a/source/libnet/libnet_join.h b/source/libnet/libnet_join.h
index 830599929bc1d6c6473734e961a350750c1ae0b1..8614d59a77230e526786acfa98da6f92b4c7d4d2 100644 (file)
--- a/source/libnet/libnet_join.h
+++ b/source/libnet/libnet_join.h
@@ -34,7 +34,7 @@ union libnet_JoinDomain {
                struct _libnet_JoinDomain_in {
                        const char *domain_name;
                        const char *account_name;
-                       uint32      acct_type;
+                       uint32_t  acct_type;
                } in;
 
                struct _libnet_JoinDomain_out {

diff --git a/source/libnet/libnet_rpc.h b/source/libnet/libnet_rpc.h
index 6b1eefd592e41dd3b315e14668d1913974191b30..f241aea19ab9d38b242ccf493cee5f04085a77e1 100644 (file)
--- a/source/libnet/libnet_rpc.h
+++ b/source/libnet/libnet_rpc.h
@@ -53,7 +53,7 @@ union libnet_rpc_connect {
                        const char *server_name;
                        const char *dcerpc_iface_name;
                        const char *dcerpc_iface_uuid;
-                       uint32 dcerpc_iface_version;
+                       uint32_t dcerpc_iface_version;
                } in;
 
                struct _libnet_rpc_connect_out {
@@ -70,7 +70,7 @@ union libnet_rpc_connect {
                        const char *domain_name;
                        const char *dcerpc_iface_name;
                        const char *dcerpc_iface_uuid;
-                       uint32 dcerpc_iface_version;
+                       uint32_t dcerpc_iface_version;
                } in;
 
                struct _libnet_rpc_connect_out out;

diff --git a/source/librpc/rpc/dcerpc_util.c b/source/librpc/rpc/dcerpc_util.c
index a78885b3f6f34591d7bade04b14724a2222fd6a1..ac15a62e5423e1491a3576f92e37b1e60aef377b 100644 (file)
--- a/source/librpc/rpc/dcerpc_util.c
+++ b/source/librpc/rpc/dcerpc_util.c
@@ -465,7 +465,7 @@ NTSTATUS dcerpc_floor_get_lhs_data(struct epm_floor *floor, struct GUID *uuid, u
        return status;
 }
 
-DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, struct GUID *uuid, uint32 if_version)
+DATA_BLOB dcerpc_floor_pack_lhs_data(TALLOC_CTX *mem_ctx, struct GUID *uuid, uint32_t if_version)
 {
        struct ndr_push *ndr = ndr_push_init_ctx(mem_ctx);
 

diff --git a/source/nsswitch/wb_common.c b/source/nsswitch/wb_common.c
index a26e430db4fe1ab4b06e28214d39909b4510024c..d7b4614f354af46386c55dd0e69b939d7e4bf466 100644 (file)
--- a/source/nsswitch/wb_common.c
+++ b/source/nsswitch/wb_common.c
@@ -25,6 +25,7 @@
 */
 
 #include "includes.h"
+#include "nsswitch/winbind_client.h"
 
 /* Global variables.  These are effectively the client state information */
 

diff --git a/source/ntvfs/common/brlock.c b/source/ntvfs/common/brlock.c
index e88e9638a3fc616c060b1ef257c5a2e5a6ea4493..e693d57ca0cc08d6dd1ec8bf39660bf8a237c213 100644 (file)
--- a/source/ntvfs/common/brlock.c
+++ b/source/ntvfs/common/brlock.c
@@ -26,6 +26,7 @@
    used. This allows us to provide the same semantics as NT */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
 #include "messages.h"
 

diff --git a/source/ntvfs/common/opendb.c b/source/ntvfs/common/opendb.c
index be6f3564220867404a5ac84a8d7047a6123673d5..231576b3d5e3c3b77543876f9a59657092d977a2 100644 (file)
--- a/source/ntvfs/common/opendb.c
+++ b/source/ntvfs/common/opendb.c
@@ -39,6 +39,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/tdb/include/tdb.h"
 #include "messages.h"
 #include "librpc/gen_ndr/ndr_security.h"

diff --git a/source/ntvfs/common/sidmap.c b/source/ntvfs/common/sidmap.c
index 46e02b5da1fcdce2864e17c1575e29aea9437abc..8e040d5081828182e469c82b8d8650d0b008dd01 100644 (file)
--- a/source/ntvfs/common/sidmap.c
+++ b/source/ntvfs/common/sidmap.c
@@ -21,6 +21,8 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "system/passwd.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /*

diff --git a/source/ntvfs/ipc/ipc_rap.c b/source/ntvfs/ipc/ipc_rap.c
index 7ee7d26e35cfc817d825a846f3c3fee849ad8803..d93b67b7153ee0885ca3ab293be4b92e38792dbd 100644 (file)
--- a/source/ntvfs/ipc/ipc_rap.c
+++ b/source/ntvfs/ipc/ipc_rap.c
@@ -53,14 +53,14 @@ static void rap_heap_restore(struct rap_string_heap *heap,
 
 struct rap_call {
        TALLOC_CTX *mem_ctx;
-       uint16 callno;
+       uint16_t callno;
        const char *paramdesc;
        const char *datadesc;
 
-       uint16 status;
-       uint16 convert;
+       uint16_t status;
+       uint16_t convert;
 
-       uint16 rcv_paramlen, rcv_datalen;
+       uint16_t rcv_paramlen, rcv_datalen;
 
        struct ndr_push *ndr_push_param;
        struct ndr_push *ndr_push_data;
@@ -104,7 +104,7 @@ static struct rap_call *new_rap_srv_call(TALLOC_CTX *mem_ctx,
        return call;
 }
 
-static NTSTATUS rap_srv_pull_word(struct rap_call *call, uint16 *result)
+static NTSTATUS rap_srv_pull_word(struct rap_call *call, uint16_t *result)
 {
        if (*call->paramdesc++ != 'W')
                return NT_STATUS_INVALID_PARAMETER;
@@ -112,7 +112,7 @@ static NTSTATUS rap_srv_pull_word(struct rap_call *call, uint16 *result)
        return ndr_pull_uint16(call->ndr_pull_param, NDR_SCALARS, result);
 }
 
-static NTSTATUS rap_srv_pull_dword(struct rap_call *call, uint32 *result)
+static NTSTATUS rap_srv_pull_dword(struct rap_call *call, uint32_t *result)
 {
        if (*call->paramdesc++ != 'D')
                return NT_STATUS_INVALID_PARAMETER;
@@ -135,7 +135,7 @@ static NTSTATUS rap_srv_pull_string(struct rap_call *call, const char **result)
        return ndr_pull_string(call->ndr_pull_param, NDR_SCALARS, result);
 }
 
-static NTSTATUS rap_srv_pull_bufsize(struct rap_call *call, uint16 *bufsize)
+static NTSTATUS rap_srv_pull_bufsize(struct rap_call *call, uint16_t *bufsize)
 {
        NTSTATUS result;
 

diff --git a/source/ntvfs/nbench/vfs_nbench.c b/source/ntvfs/nbench/vfs_nbench.c
index a1f03da367f375dbd7938090718c30a5fdb1f57c..acfa6313d371a5334733f9196a68a479f0ed387c 100644 (file)
--- a/source/ntvfs/nbench/vfs_nbench.c
+++ b/source/ntvfs/nbench/vfs_nbench.c
@@ -25,6 +25,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "smb_server/smb_server.h"
 
 /* this is stored in ntvfs_private */

diff --git a/source/ntvfs/posix/pvfs_acl.c b/source/ntvfs/posix/pvfs_acl.c
index 258d4e5bcb6f22b1e5d6a2901cdab73ac5c4178b..7e4b07a9410b438da4a9f4cf4d57eaa26227cc31 100644 (file)
--- a/source/ntvfs/posix/pvfs_acl.c
+++ b/source/ntvfs/posix/pvfs_acl.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "auth/auth.h"
-#include "system/filesys.h"
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 

diff --git a/source/ntvfs/posix/pvfs_open.c b/source/ntvfs/posix/pvfs_open.c
index ae8841e7b5ba34b493bcbf81076e5e50c9c2e719..e68670f7cc5d4076881dab265d3027611a5af207 100644 (file)
--- a/source/ntvfs/posix/pvfs_open.c
+++ b/source/ntvfs/posix/pvfs_open.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"
-#include "system/filesys.h"
 #include "dlinklist.h"
 #include "messages.h"
 #include "librpc/gen_ndr/ndr_xattr.h"

diff --git a/source/ntvfs/posix/pvfs_read.c b/source/ntvfs/posix/pvfs_read.c
index db597d709745c71af8fb216dda4871cf75b0fd10..fb656470b889aec67021948972aa17498f4783dd 100644 (file)
--- a/source/ntvfs/posix/pvfs_read.c
+++ b/source/ntvfs/posix/pvfs_read.c
@@ -22,7 +22,6 @@
 
 #include "includes.h"
 #include "vfs_posix.h"
-#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /*

diff --git a/source/ntvfs/posix/pvfs_search.c b/source/ntvfs/posix/pvfs_search.c
index 76c1996ec736c84da2a28847032cfbda39e28150..69ca6ef997018e6095dc1fe3b148be57e65f1690 100644 (file)
--- a/source/ntvfs/posix/pvfs_search.c
+++ b/source/ntvfs/posix/pvfs_search.c
@@ -23,7 +23,6 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "system/time.h"
-#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 

diff --git a/source/ntvfs/posix/pvfs_streams.c b/source/ntvfs/posix/pvfs_streams.c
index c9f2fcae290b79474573198f0a34bb3c20d82e9e..2ee5034736fa31127d130d57c3a13ed8e3d09d4b 100644 (file)
--- a/source/ntvfs/posix/pvfs_streams.c
+++ b/source/ntvfs/posix/pvfs_streams.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "system/filesys.h"
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/ndr_xattr.h"
 

diff --git a/source/ntvfs/posix/vfs_posix.h b/source/ntvfs/posix/vfs_posix.h
index 28f1aab94fa1295951c5c7d30c6f3522c0de8eca..f779936bf96e88c5fb3fa8c1a473891b1f300354 100644 (file)
--- a/source/ntvfs/posix/vfs_posix.h
+++ b/source/ntvfs/posix/vfs_posix.h
@@ -23,6 +23,7 @@
 #ifndef _VFS_POSIX_H_
 #define _VFS_POSIX_H_
 
+#include "system/filesys.h"
 #include "smb_server/smb_server.h"
 
 /* this is the private structure for the posix vfs backend. It is used

diff --git a/source/ntvfs/posix/xattr_system.c b/source/ntvfs/posix/xattr_system.c
index f19177f44c7e44383af5219c017b69dffe2e04aa..3b8becf6fec87982477a37d362c46168f6f5d138 100644 (file)
--- a/source/ntvfs/posix/xattr_system.c
+++ b/source/ntvfs/posix/xattr_system.c
@@ -21,7 +21,6 @@
 */
 
 #include "includes.h"
-#include "system/filesys.h"
 #include "vfs_posix.h"
 
 /*

diff --git a/source/ntvfs/simple/svfs_util.c b/source/ntvfs/simple/svfs_util.c
index c44a5274583e9ad51187614a58990166c7980364..3f6e205e71e8264244aa6d1dc480b4aef93c77e4 100644 (file)
--- a/source/ntvfs/simple/svfs_util.c
+++ b/source/ntvfs/simple/svfs_util.c
@@ -24,6 +24,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "svfs.h"
 #include "system/time.h"
 #include "system/dir.h"

diff --git a/source/ntvfs/simple/vfs_simple.c b/source/ntvfs/simple/vfs_simple.c
index ace0ad896f91dde8f6878342cc54ba91bf1235ce..6f634efd534cb7c7a2985b7d0699071cefcf1c40 100644 (file)
--- a/source/ntvfs/simple/vfs_simple.c
+++ b/source/ntvfs/simple/vfs_simple.c
@@ -27,6 +27,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "svfs.h"
 #include "system/time.h"
 #include "dlinklist.h"

diff --git a/source/ntvfs/unixuid/vfs_unixuid.c b/source/ntvfs/unixuid/vfs_unixuid.c
index 9915660d9be49c31f023f67be9831303f384cdb7..d724e7ceb2be9ec64bf4947206bc52875bd3d22c 100644 (file)
--- a/source/ntvfs/unixuid/vfs_unixuid.c
+++ b/source/ntvfs/unixuid/vfs_unixuid.c
@@ -22,6 +22,8 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "system/passwd.h"
 #include "auth/auth.h"
 #include "libcli/security/security.h"
 #include "smb_server/smb_server.h"

diff --git a/source/passdb/secrets.c b/source/passdb/secrets.c
index 89041fa4ebd752a10ed6aa4ab463c62d3dfbd2e2..afc26aed46f6fa471e9cb87b66b7287acdd09a66 100644 (file)
--- a/source/passdb/secrets.c
+++ b/source/passdb/secrets.c
@@ -25,6 +25,8 @@
 #include "includes.h"
 #include "lib/tdb/include/tdbutil.h"
 #include "secrets.h"
+#include "system/filesys.h"
+#include "pstring.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_PASSDB

diff --git a/source/rpc_server/dcerpc_server.c b/source/rpc_server/dcerpc_server.c
index 63f8187f24f74b0a2269a37c0e5b2f986c06b105..c0cd221da6ad00dcc09178bb6a0e50001ac5bfef 100644 (file)
--- a/source/rpc_server/dcerpc_server.c
+++ b/source/rpc_server/dcerpc_server.c
@@ -609,7 +609,7 @@ static NTSTATUS dcesrv_auth3(struct dcesrv_call_state *call)
 /*
   handle a bind request
 */
-static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32 context_id)
+static NTSTATUS dcesrv_alter_new_context(struct dcesrv_call_state *call, uint32_t context_id)
 {
        uint32_t if_version, transfer_syntax_version;
        const char *uuid, *transfer_syntax;

diff --git a/source/rpc_server/dcerpc_sock.c b/source/rpc_server/dcerpc_sock.c
index 3f99b59a4daa40ef5ab2fc8bef4bceebb3da13fe..fb1ed56f4d892ac7bfac8040dae85cd3ea1d2bad 100644 (file)
--- a/source/rpc_server/dcerpc_sock.c
+++ b/source/rpc_server/dcerpc_sock.c
@@ -23,6 +23,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/events/events.h"
 #include "rpc_server/dcerpc_server.h"
 #include "smbd/service_stream.h"

diff --git a/source/rpc_server/dcom/rodb.c b/source/rpc_server/dcom/rodb.c
index 56d51c7934a15f6af271e48c0396e9dc1d9e234c..5008e105baebfba90c350ed77133d925125ba921 100644 (file)
--- a/source/rpc_server/dcom/rodb.c
+++ b/source/rpc_server/dcom/rodb.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_rot.h"
 #include "rpc_server/common/common.h"

diff --git a/source/rpc_server/drsuapi/drsuapi_cracknames.c b/source/rpc_server/drsuapi/drsuapi_cracknames.c
index 1e77ae020a23fe4df2fa8da736be2e4c72772b43..47a4715cf811c55b00fb6eb6fb7f5da2a79b160a 100644 (file)
--- a/source/rpc_server/drsuapi/drsuapi_cracknames.c
+++ b/source/rpc_server/drsuapi/drsuapi_cracknames.c
@@ -29,7 +29,7 @@
 #include "lib/ldb/include/ldb.h"
 
 static WERROR DsCrackNameOneName(struct drsuapi_bind_state *b_state, TALLOC_CTX *mem_ctx,
-                       uint32 format_flags, uint32 format_offered, uint32 format_desired,
+                       uint32_t format_flags, uint32_t format_offered, uint32_t format_desired,
                        const char *name, struct drsuapi_DsNameInfo1 *info1)
 {
        int ret;

diff --git a/source/rpc_server/dssetup/dcesrv_dssetup.c b/source/rpc_server/dssetup/dcesrv_dssetup.c
index 2be7c684a4db6b3265d82f42c72ec3ac51679424..5df9c4fc0b526ea08f2287aa17c7eaf9b6e826e4 100644 (file)
--- a/source/rpc_server/dssetup/dcesrv_dssetup.c
+++ b/source/rpc_server/dssetup/dcesrv_dssetup.c
@@ -47,7 +47,7 @@ static WERROR dssetup_DsRoleGetPrimaryDomainInformation(struct dcesrv_call_state
                int ret;
                struct ldb_message **res;
                enum dssetup_DsRole role = DS_ROLE_STANDALONE_SERVER;
-               uint32 flags = 0;
+               uint32_t flags = 0;
                const char *domain = NULL;
                const char *dns_domain = NULL;
                const char *forest = NULL;

diff --git a/source/rpc_server/echo/rpc_echo.c b/source/rpc_server/echo/rpc_echo.c
index 173e6fbf822fffe73d2712ce12e4761abc2b6e53..28c9958c924a1be8d54ff3a67d4eb3117d147335 100644 (file)
--- a/source/rpc_server/echo/rpc_echo.c
+++ b/source/rpc_server/echo/rpc_echo.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "rpc_server/dcerpc_server.h"
 #include "librpc/gen_ndr/ndr_echo.h"
 #include "lib/events/events.h"

diff --git a/source/rpc_server/netlogon/dcerpc_netlogon.c b/source/rpc_server/netlogon/dcerpc_netlogon.c
index fac0d75ef1af5576e2452121749cdfc4a5872a72..67048e4a3def36944f6a65be0d393916ef0100e2 100644 (file)
--- a/source/rpc_server/netlogon/dcerpc_netlogon.c
+++ b/source/rpc_server/netlogon/dcerpc_netlogon.c
@@ -252,7 +252,7 @@ static NTSTATUS netr_ServerAuthenticate(struct dcesrv_call_state *dce_call, TALL
         *
         * (I think ... = 0; seems wrong here --metze)
         */
-       uint32 negotiate_flags = 0;  
+       uint32_t negotiate_flags = 0;  
 
        r3.in.server_name = r->in.server_name;
        r3.in.account_name = r->in.account_name;
@@ -271,7 +271,7 @@ static NTSTATUS netr_ServerAuthenticate2(struct dcesrv_call_state *dce_call, TAL
                                         struct netr_ServerAuthenticate2 *r)
 {
        struct netr_ServerAuthenticate3 r3;
-       uint32 rid = 0;
+       uint32_t rid = 0;
 
        r3.in.server_name = r->in.server_name;
        r3.in.account_name = r->in.account_name;

diff --git a/source/rpc_server/samr/dcesrv_samr.c b/source/rpc_server/samr/dcesrv_samr.c
index 43cad59c7ab815d6fb47b89b62b8b856357cb89b..f9752678ad454112f947468f7fb5d80b020e29e3 100644 (file)
--- a/source/rpc_server/samr/dcesrv_samr.c
+++ b/source/rpc_server/samr/dcesrv_samr.c
@@ -35,7 +35,7 @@
   This is a bad temporary hack until we have at least some kind of schema
   support
 */
-static char *ldb_hexstr(TALLOC_CTX *mem_ctx, uint32 val)
+static char *ldb_hexstr(TALLOC_CTX *mem_ctx, uint32_t val)
 {
        return talloc_asprintf(mem_ctx, "0x%.8x", val);
 }
@@ -1827,12 +1827,12 @@ static NTSTATUS samr_QueryGroupMember(struct dcesrv_call_state *dce_call, TALLOC
 
                array->count = el->num_values;
 
-               array->rids = talloc_array(mem_ctx, uint32,
+               array->rids = talloc_array(mem_ctx, uint32_t,
                                             el->num_values);
                if (array->rids == NULL)
                        return NT_STATUS_NO_MEMORY;
 
-               array->unknown = talloc_array(mem_ctx, uint32,
+               array->unknown = talloc_array(mem_ctx, uint32_t,
                                                el->num_values);
                if (array->unknown == NULL)
                        return NT_STATUS_NO_MEMORY;

diff --git a/source/rpc_server/winreg/rpc_winreg.c b/source/rpc_server/winreg/rpc_winreg.c
index c0da3cbb1139c5fee9bf172ebb5cdd5f08178a2c..050df2972717608ce8320b1c23e18f79a399e670 100644 (file)
--- a/source/rpc_server/winreg/rpc_winreg.c
+++ b/source/rpc_server/winreg/rpc_winreg.c
@@ -353,7 +353,7 @@ static WERROR winreg_QueryValue(struct dcesrv_call_state *dce_call, TALLOC_CTX *
        r->out.type = &val->data_type;
        r->out.length = &val->data_len;
        if (!r->in.data) {
-               r->out.size = talloc(mem_ctx, uint32);
+               r->out.size = talloc(mem_ctx, uint32_t);
                *r->out.size = val->data_len;
        } else {
                r->out.size = r->in.size;

diff --git a/source/smbd/process_standard.c b/source/smbd/process_standard.c
index 5439e5235a52d1ae6f798ee97b5bd0f272fb7450..014bd34afd6f984a7c0e9ef20156e24fba5c03fa 100644 (file)
--- a/source/smbd/process_standard.c
+++ b/source/smbd/process_standard.c
@@ -27,6 +27,7 @@
 #include "lib/tdb/include/tdb.h"
 #include "dlinklist.h"
 #include "smb_server/smb_server.h"
+#include "system/filesys.h"
 
 /*
   called when the process model is selected

diff --git a/source/smbd/server.c b/source/smbd/server.c
index 43d9364c9e3e4c7a19bce1e69cbc50defb696cc6..9bf71702f23880f73caa6772304dcb1cfe4a206d 100644 (file)
--- a/source/smbd/server.c
+++ b/source/smbd/server.c
@@ -29,6 +29,7 @@
 #include "dynconfig.h"
 #include "lib/cmdline/popt_common.h"
 #include "system/dir.h"
+#include "system/filesys.h"
 
 
 /*

diff --git a/source/torture/basic/delaywrite.c b/source/torture/basic/delaywrite.c
index 27a7c92eed1833f4d3122060b78be2e43785d0e3..b0d92d005dcf4220b87bf9cd43bad7acf664cb2a 100644 (file)
--- a/source/torture/basic/delaywrite.c
+++ b/source/torture/basic/delaywrite.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 #define BASEDIR "\\delaywrite"
 

diff --git a/source/torture/basic/delete.c b/source/torture/basic/delete.c
index 3247a7cd287a9449106e5411170528d12597978a..f3aef08ce1d4a2d8791af1c6050ae720428ebdad 100644 (file)
--- a/source/torture/basic/delete.c
+++ b/source/torture/basic/delete.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 

diff --git a/source/torture/basic/denytest.c b/source/torture/basic/denytest.c
index 7308805da7d96bf52f2a223eafea300bfb091d02..35c22ff19f16802061b1f2caea00c41b018eaa8c 100644 (file)
--- a/source/torture/basic/denytest.c
+++ b/source/torture/basic/denytest.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 

diff --git a/source/torture/basic/dir.c b/source/torture/basic/dir.c
index d7721ce5ae5f93b5648ab8193d07f7ee7420e2eb..59cd21f06d1c7dcb9fa3a834416f83bb6d75e18b 100644 (file)
--- a/source/torture/basic/dir.c
+++ b/source/torture/basic/dir.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 static void list_fn(struct clilist_file_info *finfo, const char *name, void *state)

diff --git a/source/torture/basic/disconnect.c b/source/torture/basic/disconnect.c
index 2a302ae3f6ddaeee387ea0e7214d8acae8353292..fab9733eb00eabbb37cf632e519739f078279f16 100644 (file)
--- a/source/torture/basic/disconnect.c
+++ b/source/torture/basic/disconnect.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 

diff --git a/source/torture/basic/locking.c b/source/torture/basic/locking.c
index 00310e54055b2bf0682a4e739602e16e391599e3..c3feaae2eb2ea0af0074fc6b3a6de6643c8691bc 100644 (file)
--- a/source/torture/basic/locking.c
+++ b/source/torture/basic/locking.c
@@ -24,6 +24,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 #define BASEDIR "\\locktest"
 

diff --git a/source/torture/basic/mangle_test.c b/source/torture/basic/mangle_test.c
index a0333b1c53b5b28c316fd994b918a2b9c92a2d73..3ea2644d1a2874fea9e24da9f5ba17b477c17cf1 100644 (file)
--- a/source/torture/basic/mangle_test.c
+++ b/source/torture/basic/mangle_test.c
@@ -19,7 +19,9 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/tdb/include/tdbutil.h"
+#include "pstring.h"
 
 static TDB_CONTEXT *tdb;
 

diff --git a/source/torture/basic/scanner.c b/source/torture/basic/scanner.c
index b1bbdf1cd1784fb9936a8ee80f2b4a2720a74968..df9234feca529cf1f78ff3040873f2efa9dc0435 100644 (file)
--- a/source/torture/basic/scanner.c
+++ b/source/torture/basic/scanner.c
@@ -20,7 +20,9 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "pstring.h"
 
 #define VERBOSE 0
 #define OP_MIN 0

diff --git a/source/torture/basic/unlink.c b/source/torture/basic/unlink.c
index 30d862e3453fd856816caea049f5dc41c2e9d837..40a486f93f98df0beb255eedf7a6d2abc279bf38 100644 (file)
--- a/source/torture/basic/unlink.c
+++ b/source/torture/basic/unlink.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 

diff --git a/source/torture/basic/utable.c b/source/torture/basic/utable.c
index 01984077a352eee9557e59988dbad3dd935db1e8..ea1bb76b8c559459fd08f6f6b0270c7daa866980 100644 (file)
--- a/source/torture/basic/utable.c
+++ b/source/torture/basic/utable.c
@@ -20,7 +20,9 @@
 
 #include "includes.h"
 #include "system/iconv.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "pstring.h"
 
 BOOL torture_utable(void)
 {

diff --git a/source/torture/gentest.c b/source/torture/gentest.c
index 87d49c6ce5fd1d720bf4e68dee44e9d2da24c96a..19fa03df8c894c0f301693e46290017ffdc5532b 100644 (file)
--- a/source/torture/gentest.c
+++ b/source/torture/gentest.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "dynconfig.h"
 #include "system/time.h"
+#include "system/filesys.h"
 #include "request.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"

diff --git a/source/torture/local/messaging.c b/source/torture/local/messaging.c
index 958fcaa8f082b69d951c0b059ab5ee7e362ad93e..f12f3f6bdf837498bd767f394ac4d13bbd11a7c8 100644 (file)
--- a/source/torture/local/messaging.c
+++ b/source/torture/local/messaging.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "lib/events/events.h"
 
 enum {MY_PING=1000, MY_PONG, MY_EXIT};

diff --git a/source/torture/locktest.c b/source/torture/locktest.c
index 161f51e1da6bcac4dff575cc4908e8c4846c1be1..74f348638ca1628b3371f7f2a2e9318c4476a613 100644 (file)
--- a/source/torture/locktest.c
+++ b/source/torture/locktest.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dynconfig.h"
 #include "system/time.h"
 

diff --git a/source/torture/masktest.c b/source/torture/masktest.c
index a560c19f44b3e7b82f05082c68955f8fad955bcb..4c71385ad09ca465f248716cbeacb08713be885d 100644 (file)
--- a/source/torture/masktest.c
+++ b/source/torture/masktest.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dynconfig.h"
 #include "clilist.h"
 #include "libcli/raw/libcliraw.h"

diff --git a/source/torture/nbench/nbench.c b/source/torture/nbench/nbench.c
index afd71537a91cf3e1e56636262c2006fe84459462..748ff90467462255c82fc59f1b042d179ae528ac 100644 (file)
--- a/source/torture/nbench/nbench.c
+++ b/source/torture/nbench/nbench.c
@@ -19,6 +19,8 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
+#include "pstring.h"
 
 int nbench_line_count = 0;
 static int timelimit = 600;

diff --git a/source/torture/nbench/nbio.c b/source/torture/nbench/nbio.c
index 1864c82fdcba9c2af2b54cd467981ad05dd06c60..1cb00b67331f7afc1e6945800c651eb5f8a075fb 100644 (file)
--- a/source/torture/nbench/nbio.c
+++ b/source/torture/nbench/nbio.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "system/time.h"
+#include "system/filesys.h"
 #include "dlinklist.h"
 #include "librpc/gen_ndr/ndr_security.h"
 

diff --git a/source/torture/rap/rap.c b/source/torture/rap/rap.c
index f46c00eaead4bd47fc6515eed26534c13b966541..f245bc679e0609c45152398eb677a78cc3a77bb8 100644 (file)
--- a/source/torture/rap/rap.c
+++ b/source/torture/rap/rap.c
@@ -23,14 +23,14 @@
 #include "rap.h"
 
 struct rap_call {
-       uint16 callno;
+       uint16_t callno;
        char *paramdesc;
        const char *datadesc;
 
-       uint16 status;
-       uint16 convert;
+       uint16_t status;
+       uint16_t convert;
        
-       uint16 rcv_paramlen, rcv_datalen;
+       uint16_t rcv_paramlen, rcv_datalen;
 
        struct ndr_push *ndr_push_param;
        struct ndr_push *ndr_push_data;
@@ -40,7 +40,7 @@ struct rap_call {
 
 #define RAPNDR_FLAGS (LIBNDR_FLAG_NOALIGN|LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM);
 
-static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16 callno)
+static struct rap_call *new_rap_cli_call(TALLOC_CTX *mem_ctx, uint16_t callno)
 {
        struct rap_call *call;
 
@@ -80,13 +80,13 @@ static void rap_cli_push_paramdesc(struct rap_call *call, char desc)
        call->paramdesc[len+1] = '\0';
 }
 
-static void rap_cli_push_word(struct rap_call *call, uint16 val)
+static void rap_cli_push_word(struct rap_call *call, uint16_t val)
 {
        rap_cli_push_paramdesc(call, 'W');
        ndr_push_uint16(call->ndr_push_param, NDR_SCALARS, val);
 }
 
-static void rap_cli_push_dword(struct rap_call *call, uint32 val)
+static void rap_cli_push_dword(struct rap_call *call, uint32_t val)
 {
        rap_cli_push_paramdesc(call, 'D');
        ndr_push_uint32(call->ndr_push_param, NDR_SCALARS, val);
@@ -104,7 +104,7 @@ static void rap_cli_expect_multiple_entries(struct rap_call *call)
 {
        rap_cli_push_paramdesc(call, 'e');
        rap_cli_push_paramdesc(call, 'h');
-       call->rcv_paramlen += 4; /* uint16 entry count, uint16 total */
+       call->rcv_paramlen += 4; /* uint16_t entry count, uint16_t total */
 }
 
 static void rap_cli_push_string(struct rap_call *call, const char *str)
@@ -123,10 +123,10 @@ static void rap_cli_expect_format(struct rap_call *call, const char *format)
 }
 
 static NTSTATUS rap_pull_string(TALLOC_CTX *mem_ctx, struct ndr_pull *ndr,
-                               uint16 convert, char **dest)
+                               uint16_t convert, char **dest)
 {
-       uint16 string_offset;
-       uint16 ignore;
+       uint16_t string_offset;
+       uint16_t ignore;
        const char *p;
        size_t len;
 

diff --git a/source/torture/raw/acls.c b/source/torture/raw/acls.c
index fd1ea0f34092e2b12c06dbb4cdd42baab40e1ecc..f6a51a8d91e515ee6be5ebbf35c8ffd5c4ccabb5 100644 (file)
--- a/source/torture/raw/acls.c
+++ b/source/torture/raw/acls.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
@@ -843,7 +844,7 @@ static BOOL test_owner_bits(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        expected_bits = SEC_FILE_WRITE_DATA | SEC_FILE_READ_ATTRIBUTE;
 
        for (i=0;i<16;i++) {
-               uint32 bit = (1<<i);
+               uint32_t bit = (1<<i);
                io.ntcreatex.in.access_mask = bit;
                status = smb_raw_open(cli->tree, mem_ctx, &io);
                if (expected_bits & bit) {

diff --git a/source/torture/raw/lock.c b/source/torture/raw/lock.c
index f2cd5b7cf715c48fcfcb2a2fbcfecb9b5ce9d688..97242e8f176fa747d043b6149024f2b29759a41f 100644 (file)
--- a/source/torture/raw/lock.c
+++ b/source/torture/raw/lock.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source/torture/raw/mux.c b/source/torture/raw/mux.c
index e8f7e4a7121ec14d154681538dd05d59f6b9a129..379e455b2b5af7b68d6ef1257adcd7b6c3b46de1 100644 (file)
--- a/source/torture/raw/mux.c
+++ b/source/torture/raw/mux.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
 

diff --git a/source/torture/raw/open.c b/source/torture/raw/open.c
index 17a7f18505abc5b1d7722ab6b9c5e99ce9b90512..8792ab7caba80f5f4f33741d7aca7eb98cf30ead 100644 (file)
--- a/source/torture/raw/open.c
+++ b/source/torture/raw/open.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "system/filesys.h"
 #include "librpc/gen_ndr/ndr_security.h"
 
 /* enum for whether reads/writes are possible on a file */

diff --git a/source/torture/raw/read.c b/source/torture/raw/read.c
index e8e305d01c17cfb72bb1019d33c3288ee512b30c..3e27f4b0bb6a1393b9b529f281175557c5c94262 100644 (file)
--- a/source/torture/raw/read.c
+++ b/source/torture/raw/read.c
@@ -21,6 +21,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source/torture/raw/search.c b/source/torture/raw/search.c
index be54aecb3dd913eccebd4d36bff0a457844d98ea..0f04648672a0bca43e91178d349ce3fabdf07bd4 100644 (file)
--- a/source/torture/raw/search.c
+++ b/source/torture/raw/search.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 
 

diff --git a/source/torture/raw/seek.c b/source/torture/raw/seek.c
index 0d34c831a52c7f90d6a302eeba857eb2684ca587..9652b7597f818a845d20bff45e916c378204b889 100644 (file)
--- a/source/torture/raw/seek.c
+++ b/source/torture/raw/seek.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source/torture/raw/streams.c b/source/torture/raw/streams.c
index 54c83de89634f84a923ab9402afa5fa6372b8633..6753234af456078b31562dba891951738498f492 100644 (file)
--- a/source/torture/raw/streams.c
+++ b/source/torture/raw/streams.c
@@ -23,6 +23,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "librpc/gen_ndr/ndr_security.h"
+#include "system/filesys.h"
 
 #define BASEDIR "\\teststreams"
 

diff --git a/source/torture/raw/unlink.c b/source/torture/raw/unlink.c
index 1c8c35d72fdc6fd0c1bd1ddd372ac988c68d8758..5874da6ef7b7949fc9ee75cade7a42de9fcfd4cc 100644 (file)
--- a/source/torture/raw/unlink.c
+++ b/source/torture/raw/unlink.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source/torture/raw/write.c b/source/torture/raw/write.c
index 7241f8c91a52e355dfc49b4d94c27942fe902661..dead0e4971749623c716aac75697243efb929e61 100644 (file)
--- a/source/torture/raw/write.c
+++ b/source/torture/raw/write.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
+#include "system/filesys.h"
 
 #define CHECK_STATUS(status, correct) do { \
        if (!NT_STATUS_EQUAL(status, correct)) { \

diff --git a/source/torture/rpc/lsa.c b/source/torture/rpc/lsa.c
index 089f58dc9915e9d171db6ce74c50b18066dac34b..277a5fc793bc19e6a07e09e02cd564d0d7c10072 100644 (file)
--- a/source/torture/rpc/lsa.c
+++ b/source/torture/rpc/lsa.c
@@ -1141,7 +1141,7 @@ static BOOL test_LookupPrivDisplayName(struct dcerpc_pipe *p,
        NTSTATUS status;
        /* produce a reasonable range of language output without screwing up
           terminals */
-       uint16 language_id = (random() % 4) + 0x409;
+       uint16_t language_id = (random() % 4) + 0x409;
 
        printf("testing LookupPrivDisplayName(%s)\n", priv_name->string);
        

diff --git a/source/torture/rpc/netlogon.c b/source/torture/rpc/netlogon.c
index e3c2be038a8ef78a06b8104c38078c0107b252f4..7c516da11804a9beb0e218147a243905d7e35303 100644 (file)
--- a/source/torture/rpc/netlogon.c
+++ b/source/torture/rpc/netlogon.c
@@ -199,7 +199,7 @@ BOOL test_SetupCredentials3(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        struct netr_ServerAuthenticate3 a;
        struct netr_Credential credentials1, credentials2, credentials3;
        struct samr_Password mach_password;
-       uint32 rid;
+       uint32_t rid;
 
        printf("Testing ServerReqChallenge\n");
 

diff --git a/source/torture/rpc/oxidresolve.c b/source/torture/rpc/oxidresolve.c
index b565d5de7610f2c1e2e400e42a6e51804f925917..6164825af73dc2f89f8df7e86689a4e7e558aa36 100644 (file)
--- a/source/torture/rpc/oxidresolve.c
+++ b/source/torture/rpc/oxidresolve.c
@@ -33,7 +33,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uin
        struct RemoteActivation r;
        NTSTATUS status;
        struct GUID iids[2];
-       uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
+       uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
 
        ZERO_STRUCT(r.in);
        r.in.this.version.MajorVersion = 5;
@@ -147,7 +147,7 @@ static int test_ResolveOxid(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_t
 {
        struct ResolveOxid r;
        NTSTATUS status;
-       uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };     
+       uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };   
 
        r.in.pOxid = oxid;
        r.in.cRequestedProtseqs = 2;
@@ -171,7 +171,7 @@ static int test_ResolveOxid2(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint64_
 {
        struct ResolveOxid2 r;
        NTSTATUS status;
-       uint16 protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };     
+       uint16_t protseq[2] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_SMB };   
 
        r.in.pOxid = oxid;
        r.in.cRequestedProtseqs = 2;

diff --git a/source/torture/rpc/remact.c b/source/torture/rpc/remact.c
index aaef981fdbb70fbd7cfdf18c8bc39a05ba69767b..269c92a5b44db3f019cc62da31c4c98abd75243d 100644 (file)
--- a/source/torture/rpc/remact.c
+++ b/source/torture/rpc/remact.c
@@ -32,7 +32,7 @@ static int test_RemoteActivation(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx)
        struct RemoteActivation r;
        NTSTATUS status;
        struct GUID iids[2];
-       uint16 protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
+       uint16_t protseq[3] = { EPM_PROTOCOL_TCP, EPM_PROTOCOL_NCALRPC, EPM_PROTOCOL_UUID };
 
        ZERO_STRUCT(r.in);
        r.in.this.version.MajorVersion = 5;

diff --git a/source/torture/rpc/samlogon.c b/source/torture/rpc/samlogon.c
index 1c7e3e03501a5b329027ef09fc79879e68bbf3c7..06988459fd2c48e49cd63200e62d6e733d4433f2 100644 (file)
--- a/source/torture/rpc/samlogon.c
+++ b/source/torture/rpc/samlogon.c
@@ -73,7 +73,7 @@ static NTSTATUS check_samlogon(struct samlogon_state *samlogon_state,
        struct netr_LogonSamLogonWithFlags *r_flags = &samlogon_state->r_flags;
        struct netr_NetworkInfo ninfo;
        struct netr_SamBaseInfo *base = NULL;
-       uint16 validation_level = 0;
+       uint16_t validation_level = 0;
        
        samlogon_state->r.in.logon.network = &ninfo;
        samlogon_state->r_ex.in.logon.network = &ninfo;

diff --git a/source/torture/rpc/samr.c b/source/torture/rpc/samr.c
index fa64b556ef8e8115aaeaf8e7b2ecfe797e0be577..31380c109a6cb817b2388c0e9a0fdf585e1826f8 100644 (file)
--- a/source/torture/rpc/samr.c
+++ b/source/torture/rpc/samr.c
@@ -433,7 +433,7 @@ static BOOL test_SetUserPass(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 
 
 static BOOL test_SetUserPass_23(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                               struct policy_handle *handle, uint32 fields_present,
+                               struct policy_handle *handle, uint32_t fields_present,
                                char **password)
 {
        NTSTATUS status;
@@ -547,7 +547,7 @@ static BOOL test_SetUserPassEx(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
 }
 
 static BOOL test_SetUserPass_25(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
-                               struct policy_handle *handle, uint32 fields_present,
+                               struct policy_handle *handle, uint32_t fields_present,
                                char **password)
 {
        NTSTATUS status;
@@ -1546,7 +1546,7 @@ static BOOL test_CreateUser(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        char *password = NULL;
 
        int i;
-       const uint32 password_fields[] = {
+       const uint32_t password_fields[] = {
                SAMR_FIELD_PASSWORD,
                SAMR_FIELD_PASSWORD2,
                SAMR_FIELD_PASSWORD | SAMR_FIELD_PASSWORD2,

diff --git a/source/torture/rpc/samsync.c b/source/torture/rpc/samsync.c
index f7800e28ccbc0e9b37cde2ccedfa2ce66c7c69e7..3fc916450f7923b7a944431070f6407d140291c8 100644 (file)
--- a/source/torture/rpc/samsync.c
+++ b/source/torture/rpc/samsync.c
@@ -389,7 +389,7 @@ static BOOL samsync_handle_policy(TALLOC_CTX *mem_ctx, struct samsync_state *sam
 static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
                                int database_id, struct netr_DELTA_ENUM *delta) 
 {
-       uint32 rid = delta->delta_id_union.rid;
+       uint32_t rid = delta->delta_id_union.rid;
        struct netr_DELTA_USER *user = delta->delta_union.user;
        struct netr_SamInfo3 *info3;
        struct samr_Password lm_hash;
@@ -604,7 +604,7 @@ static BOOL samsync_handle_user(TALLOC_CTX *mem_ctx, struct samsync_state *samsy
 static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
                                 int database_id, struct netr_DELTA_ENUM *delta) 
 {
-       uint32 rid = delta->delta_id_union.rid;
+       uint32_t rid = delta->delta_id_union.rid;
        struct netr_DELTA_ALIAS *alias = delta->delta_union.alias;
        NTSTATUS nt_status;
        BOOL ret = True;
@@ -653,7 +653,7 @@ static BOOL samsync_handle_alias(TALLOC_CTX *mem_ctx, struct samsync_state *sams
 static BOOL samsync_handle_group(TALLOC_CTX *mem_ctx, struct samsync_state *samsync_state,
                                 int database_id, struct netr_DELTA_ENUM *delta) 
 {
-       uint32 rid = delta->delta_id_union.rid;
+       uint32_t rid = delta->delta_id_union.rid;
        struct netr_DELTA_GROUP *group = delta->delta_union.group;
        NTSTATUS nt_status;
        BOOL ret = True;

diff --git a/source/torture/rpc/schannel.c b/source/torture/rpc/schannel.c
index bf225a16021107999fb483e14595658ce1d98221..26f186e912a28a89d60866cc667ca0dacc9ff0a2 100644 (file)
--- a/source/torture/rpc/schannel.c
+++ b/source/torture/rpc/schannel.c
@@ -114,8 +114,8 @@ static BOOL test_netlogon_ops(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
   test a schannel connection with the given flags
  */
 static BOOL test_schannel(TALLOC_CTX *mem_ctx, 
-                         uint16 acct_flags, uint32 dcerpc_flags,
-                         uint32 schannel_type)
+                         uint16_t acct_flags, uint32_t dcerpc_flags,
+                         uint32_t schannel_type)
 {
        void *join_ctx;
        const char *machine_password;
@@ -215,9 +215,9 @@ BOOL torture_rpc_schannel(void)
        TALLOC_CTX *mem_ctx;
        BOOL ret = True;
        struct {
-               uint16 acct_flags;
-               uint32 dcerpc_flags;
-               uint32 schannel_type;
+               uint16_t acct_flags;
+               uint32_t dcerpc_flags;
+               uint32_t schannel_type;
        } tests[] = {
                { ACB_WSTRUST,   DCERPC_SCHANNEL_WORKSTATION | DCERPC_SIGN,                       3 },
                { ACB_WSTRUST,   DCERPC_SCHANNEL_WORKSTATION | DCERPC_SEAL,                       3 },

diff --git a/source/torture/rpc/srvsvc.c b/source/torture/rpc/srvsvc.c
index 4b1305b7b6b66d87d554462cc6be21972a7aa952..697ae4afe7865b7f2ce8eb3bb44507d9ac56bfec 100644 (file)
--- a/source/torture/rpc/srvsvc.c
+++ b/source/torture/rpc/srvsvc.c
@@ -105,7 +105,7 @@ static BOOL test_NetCharDevEnum(struct dcerpc_pipe *p,
        r.in.ctr.ctr0 = &c0;
        r.in.ctr.ctr0->count = 0;
        r.in.ctr.ctr0->array = NULL;
-       r.in.max_buffer = (uint32)-1;
+       r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = NULL;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {
@@ -252,7 +252,7 @@ static BOOL test_NetCharDevQEnum(struct dcerpc_pipe *p,
        r.in.ctr.ctr0 = &c0;
        r.in.ctr.ctr0->count = 0;
        r.in.ctr.ctr0->array = NULL;
-       r.in.max_buffer = (uint32)-1;
+       r.in.max_buffer = (uint32_t)-1;
        r.in.resume_handle = NULL;
 
        for (i=0;i<ARRAY_SIZE(levels);i++) {

diff --git a/source/torture/rpc/svcctl.c b/source/torture/rpc/svcctl.c
index cadc80a41757ac34351ade92bd6845025e85508e..092329ab68f8ce595c6ba7c994ee14d34d0a3193 100644 (file)
--- a/source/torture/rpc/svcctl.c
+++ b/source/torture/rpc/svcctl.c
@@ -28,7 +28,7 @@ static BOOL test_EnumServicesStatus(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        struct svcctl_EnumServicesStatusW r;
        int i;
        NTSTATUS status;
-       uint32 resume_handle = 0;
+       uint32_t resume_handle = 0;
        struct ENUM_SERVICE_STATUS *service = NULL; 
 
        r.in.handle = h;

diff --git a/source/torture/rpc/winreg.c b/source/torture/rpc/winreg.c
index f2d79fffa0e0648b413a20053934814612b0abeb..9d259ae47a930b2e265d47ef345886d84b22b259 100644 (file)
--- a/source/torture/rpc/winreg.c
+++ b/source/torture/rpc/winreg.c
@@ -365,9 +365,9 @@ static BOOL test_QueryMultipleValues(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
        r.in.values[0].type = 0;
 
        r.in.num_values = 1;
-       r.in.buffer_size = r.out.buffer_size = talloc(mem_ctx, uint32);
+       r.in.buffer_size = r.out.buffer_size = talloc(mem_ctx, uint32_t);
        *r.in.buffer_size = 0x20;
-       r.in.buffer = r.out.buffer = talloc_zero_array(mem_ctx, uint8, *r.in.buffer_size);
+       r.in.buffer = r.out.buffer = talloc_zero_array(mem_ctx, uint8_t, *r.in.buffer_size);
 
        status = dcerpc_winreg_QueryMultipleValues(p, mem_ctx, &r);
        if(NT_STATUS_IS_ERR(status)) {
@@ -387,8 +387,8 @@ static BOOL test_QueryValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct p
 {
        struct winreg_QueryValue r;
        NTSTATUS status;
-       uint32 zero = 0;
-       uint32 offered = 0xfff;
+       uint32_t zero = 0;
+       uint32_t offered = 0xfff;
 
        printf("Testing QueryValue\n");
 
@@ -417,8 +417,8 @@ static BOOL test_EnumValue(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
                           struct policy_handle *handle, int max_valnamelen, int max_valbufsize)
 {
        struct winreg_EnumValue r;
-       uint32 type = 0;
-       uint32 size = max_valbufsize, zero = 0;
+       uint32_t type = 0;
+       uint32_t size = max_valbufsize, zero = 0;
        BOOL ret = True;
        uint8_t buf8;
        uint16_t buf16;

diff --git a/source/torture/torture.c b/source/torture/torture.c
index 12b12147234509610b60fa0233593475f5a8fa72..b7ca730d1f316b8abd7560be1a2effc10fe0a70b 100644 (file)
--- a/source/torture/torture.c
+++ b/source/torture/torture.c
@@ -25,6 +25,7 @@
 #include "libcli/raw/libcliraw.h"
 #include "system/time.h"
 #include "system/wait.h"
+#include "system/filesys.h"
 #include "ioctl.h"
 #include "librpc/gen_ndr/ndr_security.h"
 

diff --git a/source/utils/net/net_password.c b/source/utils/net/net_password.c
index 8828b960ee335881188deaa8ed144a7ff0c48086..773e18d6610f74131c7bcaef76a56fdc71f942ea 100644 (file)
--- a/source/utils/net/net_password.c
+++ b/source/utils/net/net_password.c
@@ -22,6 +22,7 @@
 #include "includes.h"
 #include "utils/net/net.h"
 #include "libnet/libnet.h"
+#include "system/filesys.h"
 #include "system/passwd.h"
 
 /*

diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c
index b5e3f3b3ea34ec6757953261dc4266f4d7abe088..3c46b0ca702e75d7bbf93ba4587074b53039798b 100644 (file)
--- a/source/utils/ntlm_auth.c
+++ b/source/utils/ntlm_auth.c
@@ -25,6 +25,7 @@
 #include "includes.h"
 #include "dynconfig.h"
 #include "system/passwd.h"
+#include "system/filesys.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/auth.h"
 #include "libcli/security/security.h"
@@ -145,7 +146,7 @@ static NTSTATUS local_pw_check_specified(const char *username,
                                         const DATA_BLOB *challenge, 
                                         const DATA_BLOB *lm_response, 
                                         const DATA_BLOB *nt_response, 
-                                        uint32 flags, 
+                                        uint32_t flags, 
                                         DATA_BLOB *lm_session_key, 
                                         DATA_BLOB *user_session_key, 
                                         char **error_string, 
@@ -564,7 +565,7 @@ static void manage_ntlm_server_1_request(enum stdio_helper_mode stdio_helper_mod
                        char *error_string = NULL;
                        DATA_BLOB lm_key;
                        DATA_BLOB user_session_key;
-                       uint32 flags = 0;
+                       uint32_t flags = 0;
 
                        if (full_username && !username) {
                                fstring fstr_user;

diff --git a/source/winbind/wb_server.c b/source/winbind/wb_server.c
index e39aed91d72a4105921561b3d9acd1c09db49d25..c277772e1e56f8da7720b4c2c682b0928151fe72 100644 (file)
--- a/source/winbind/wb_server.c
+++ b/source/winbind/wb_server.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "system/filesys.h"
 #include "dlinklist.h"
 #include "lib/events/events.h"
 #include "smbd/service_task.h"