sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

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

Browse Source 
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.
(This used to be commit 9db6c79e90)
This commit is contained in:
Andrew Tridgell
2005-02-10 05:09:35 +00:00
committed by Gerald (Jerry) Carter
parent e3aae721a7
commit e82aad1ce3
137 changed files with 239 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source4/auth/auth_developer.c
View File

@ -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

1
source4/auth/auth_sam.c
View File

@ -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

1
source4/auth/auth_winbind.c
View File

@ -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)
{

10
source4/build/pidl/server.pm
View File

@ -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) {

10
source4/build/pidl/stub.pm
View File

@ -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) {

3
source4/dsdb/samdb/samdb.c
View File

@ -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;
}

1
source4/dynconfig.c
View File

@ -19,6 +19,7 @@
*/
#include "includes.h"
#include "pstring.h"
/**
* @file dynconfig.c

2
source4/include/dynconfig.h
View File

@ -25,6 +25,8 @@
* @brief Exported global configurations.
**/
#include "pstring.h"
extern char const *dyn_SBINDIR,
*dyn_BINDIR;

2
source4/include/includes.h
View File

@ -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))

3
source4/include/pstring.h
View File

@ -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

28
source4/include/rap.h
View File

@ -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;
};

2
source4/intl/lang_tdb.c
View File

@ -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;

1
source4/lib/charcnv.c
View File

@ -22,6 +22,7 @@
*/
#include "includes.h"
#include "system/iconv.h"
#include "pstring.h"
/**
* @file

1
source4/lib/cmdline/popt_common.h
View File

@ -22,6 +22,7 @@
#define _POPT_COMMON_H
#include "popt.h"
#include "pstring.h"
/* Common popt structures */
extern struct poptOption popt_common_samba[];

1
source4/lib/cmdline/readline.c
View File

@ -20,6 +20,7 @@
*/
#include "includes.h"
#include "pstring.h"
#include <unistd.h>

7
source4/lib/dcom/common/main.c
View File

@ -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));

1
source4/lib/debug.c
View File

@ -20,6 +20,7 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "dynconfig.h"
/* this global variable determines what messages are printed */

1
source4/lib/events/events.c
View File

@ -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"

1
source4/lib/fault.c
View File

@ -21,6 +21,7 @@
#include "includes.h"
#include "version.h"
#include "system/wait.h"
#include "system/filesys.h"
static void (*cont_fn)(void *);

1
source4/lib/gencache.c
View File

@ -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

5
source4/lib/genrand.c
View File

@ -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) {

1
source4/lib/iconv.c
View File

@ -22,6 +22,7 @@
#include "includes.h"
#include "dlinklist.h"
#include "system/iconv.h"
#include "system/filesys.h"
/**

1
source4/lib/ldb/ldb_tdb/ldb_tdb.h
View File

@ -1,5 +1,6 @@
#ifdef _SAMBA_BUILD_
#include "system/filesys.h"
#include "lib/tdb/include/tdb.h"
#else
#include "tdb.h"

4
source4/lib/ldb/tools/ldbadd.c
View File

@ -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)

4
source4/lib/ldb/tools/ldbdel.c
View File

@ -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;

4
source4/lib/ldb/tools/ldbedit.c
View File

@ -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;
/*

4
source4/lib/ldb/tools/ldbmodify.c
View File

@ -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)

4
source4/lib/ldb/tools/ldbrename.c
View File

@ -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");

4
source4/lib/ldb/tools/ldbsearch.c
View File

@ -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");

4
source4/lib/ldb/tools/ldbtest.c
View File

@ -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";

1
source4/lib/messaging/messaging.c
View File

@ -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"

2
source4/lib/pidfile.c
View File

@ -21,6 +21,8 @@
*/
#include "includes.h"
#include "pstring.h"
#include "system/filesys.h"
#ifndef O_NONBLOCK
#define O_NONBLOCK

1
source4/lib/registry/reg_backend_dir.c
View File

@ -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)
{

8
source4/lib/registry/reg_backend_ldb.c
View File

@ -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;

6
source4/lib/registry/reg_backend_rpc.c
View File

@ -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;

2
source4/lib/registry/reg_samba.c
View File

@ -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;

1
source4/lib/select.c
View File

@ -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

1
source4/lib/socket/socket.c
View File

@ -19,6 +19,7 @@
*/
#include "includes.h"
#include "system/filesys.h"
/*
auto-close sockets on free

1
source4/lib/socket/socket_ipv4.c
View File

@ -23,6 +23,7 @@
#include "includes.h"
#include "system/network.h"
#include "system/filesys.h"
static NTSTATUS ipv4_init(struct socket_context *sock)
{

1
source4/lib/socket/socket_ipv6.c
View File

@ -21,6 +21,7 @@
#include "includes.h"
#include "system/network.h"
#include "system/filesys.h"
static struct in6_addr interpret_addr6(const char *name)
{

1
source4/lib/socket/socket_unix.c
View File

@ -23,6 +23,7 @@
#include "includes.h"
#include "system/network.h"
#include "system/filesys.h"

1
source4/lib/system.c
View File

@ -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

1
source4/lib/tdb/common/spinlock.c
View File

@ -43,6 +43,7 @@
#else
#include "includes.h"
#include "lib/tdb/include/tdb.h"
#include "system/filesys.h"
#endif
#ifdef USE_SPINLOCKS

2
source4/lib/tdb/common/tdbutil.c
View File

@ -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 */

1
source4/lib/tdb/tools/tdbdump.c
View File

@ -39,6 +39,7 @@
#include "includes.h"
#include "lib/tdb/include/tdb.h"
#include "system/iconv.h"
#include "system/filesys.h"
#endif

1
source4/lib/tdb/tools/tdbtorture.c
View File

@ -24,6 +24,7 @@
#include "lib/tdb/include/tdb.h"
#include "system/time.h"
#include "system/wait.h"
#include "system/filesys.h"
#endif

1
source4/lib/unix_privs.c
View File

@ -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

1
source4/lib/username.c
View File

@ -20,6 +20,7 @@
*/
#include "includes.h"
#include "pstring.h"
/*****************************************************************
Splits passed user or group name to domain and user/group name parts

1
source4/lib/util.c
View File

@ -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

1
source4/lib/util_file.c
View File

@ -20,6 +20,7 @@
#include "includes.h"
#include "system/shmem.h"
#include "system/filesys.h"
/*************************************************************************
gets a line out of a file.

1
source4/lib/util_sock.c
View File

@ -21,6 +21,7 @@
#include "includes.h"
#include "system/network.h"
#include "pstring.h"
enum SOCK_OPT_TYPES {OPT_BOOL,OPT_INT,OPT_ON};

1
source4/lib/util_str.c
View File

@ -23,6 +23,7 @@
#include "includes.h"
#include "system/iconv.h"
#include "pstring.h"
/**
* @file

4
source4/libcli/auth/gensec_ntlmssp.c
View File

@ -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) {

1
source4/libcli/auth/ntlmssp.c
View File

@ -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,

1
source4/libcli/auth/ntlmssp_parse.c
View File

@ -21,6 +21,7 @@
*/
#include "includes.h"
#include "pstring.h"
/*
this is a tiny msrpc packet generator. I am only using this to

1
source4/libcli/auth/smbencrypt.c
View File

@ -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

2
source4/libcli/auth/spnego.c
View File

@ -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) {

5
source4/libcli/ldap/ldap.c
View File

@ -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);

1
source4/libcli/ldap/ldap_client.c
View File

@ -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"

1
source4/libcli/raw/clisession.c
View File

@ -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 { \

1
source4/libcli/resolve/host.c
View File

@ -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"

1
source4/libcli/util/doserr.c
View File

@ -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;

1
source4/libcli/util/nterr.c
View File

@ -21,6 +21,7 @@
/* NT error codes. please read nterr.h */
#include "includes.h"
#include "pstring.h"
typedef struct
{

4
source4/libnet/libnet_join.c
View File

@ -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 */

2
source4/libnet/libnet_join.h
View File

@ -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 {

4
source4/libnet/libnet_rpc.h
View File

@ -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;

2
source4/librpc/rpc/dcerpc_util.c
View File

@ -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);

1
source4/nsswitch/wb_common.c
View File

@ -25,6 +25,7 @@
*/
#include "includes.h"
#include "nsswitch/winbind_client.h"
/* Global variables. These are effectively the client state information */

1
source4/ntvfs/common/brlock.c
View File

@ -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"

1
source4/ntvfs/common/opendb.c
View File

@ -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"

2
source4/ntvfs/common/sidmap.c
View File

@ -21,6 +21,8 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "system/passwd.h"
#include "librpc/gen_ndr/ndr_security.h"
/*

14
source4/ntvfs/ipc/ipc_rap.c
View File

@ -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;

1
source4/ntvfs/nbench/vfs_nbench.c
View File

@ -25,6 +25,7 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "smb_server/smb_server.h"
/* this is stored in ntvfs_private */

1
source4/ntvfs/posix/pvfs_acl.c
View File

@ -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"

1
source4/ntvfs/posix/pvfs_open.c
View File

@ -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"

1
source4/ntvfs/posix/pvfs_read.c
View File

@ -22,7 +22,6 @@
#include "includes.h"
#include "vfs_posix.h"
#include "system/filesys.h"
#include "librpc/gen_ndr/ndr_security.h"
/*

1
source4/ntvfs/posix/pvfs_search.c
View File

@ -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"

1
source4/ntvfs/posix/pvfs_streams.c
View File

@ -21,7 +21,6 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "vfs_posix.h"
#include "librpc/gen_ndr/ndr_xattr.h"

1
source4/ntvfs/posix/vfs_posix.h
View File

@ -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

1
source4/ntvfs/posix/xattr_system.c
View File

@ -21,7 +21,6 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "vfs_posix.h"
/*

1
source4/ntvfs/simple/svfs_util.c
View File

@ -24,6 +24,7 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "svfs.h"
#include "system/time.h"
#include "system/dir.h"

1
source4/ntvfs/simple/vfs_simple.c
View File

@ -27,6 +27,7 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "svfs.h"
#include "system/time.h"
#include "dlinklist.h"

2
source4/ntvfs/unixuid/vfs_unixuid.c
View File

@ -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"

2
source4/passdb/secrets.c
View File

@ -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

2
source4/rpc_server/dcerpc_server.c
View File

@ -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;

1
source4/rpc_server/dcerpc_sock.c
View File

@ -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"

1
source4/rpc_server/dcom/rodb.c
View File

@ -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"

2
source4/rpc_server/drsuapi/drsuapi_cracknames.c
View File

@ -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;

2
source4/rpc_server/dssetup/dcesrv_dssetup.c
View File

@ -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;

1
source4/rpc_server/echo/rpc_echo.c
View File

@ -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"

4
source4/rpc_server/netlogon/dcerpc_netlogon.c
View File

@ -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;

6
source4/rpc_server/samr/dcesrv_samr.c
View File

@ -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;

2
source4/rpc_server/winreg/rpc_winreg.c
View File

@ -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;

1
source4/smbd/process_standard.c
View File

@ -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

1
source4/smbd/server.c
View File

@ -29,6 +29,7 @@
#include "dynconfig.h"
#include "lib/cmdline/popt_common.h"
#include "system/dir.h"
#include "system/filesys.h"
/*

1
source4/torture/basic/delaywrite.c
View File

@ -25,6 +25,7 @@
#include "includes.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "system/filesys.h"
#define BASEDIR "\\delaywrite"

1
source4/torture/basic/delete.c
View File

@ -21,6 +21,7 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "librpc/gen_ndr/ndr_security.h"

1
source4/torture/basic/denytest.c
View File

@ -19,6 +19,7 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
#include "librpc/gen_ndr/ndr_security.h"

1
source4/torture/basic/dir.c
View File

@ -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)

1
source4/torture/basic/disconnect.c
View File

@ -21,6 +21,7 @@
*/
#include "includes.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
#include "librpc/gen_ndr/ndr_security.h"

Some files were not shown because too many files have changed in this diff Show More