The branch, master has been updated via 13537db Fix the uint32/16/8 stuff in two proto.h files I missed. via 0f9f5ba Convert all uses of uint32/16/8 to _t in source3/auth. via 0674ddc Convert uint32/16/8 to _t in source3/libnet. via 589c7bc Convert all uint32/16/8 to _t in source3/client. via 63e1352 Convert a couple of uint32s to _t that I missed in source3/utils. via 5c1f8ad Convert all uint32/16/8 to _t in source3/libsmb. via dffe228 Convert all uint32/16/8 to _t in source3/lib. via c833baa Convert all uint32/16/8 to _t in source3/locking. via 9432e20 namequery: namequery: suppress bogus warning "resolve_name: unknown name switch type" from 4779832 ctdb-doc: Document externally managed public IP addresses
https://git.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 13537db35f2a009dbdeadc204e03db07d22879fe Author: Richard Sharpe <rsha...@samba.org> Date: Tue May 12 07:25:34 2015 -0700 Fix the uint32/16/8 stuff in two proto.h files I missed. Signed-off-by: Richard Sharpe <rsha...@gmail.com> Reviewed-by: Jeremy Allison <j...@samba.org> Autobuild-User(master): Jeremy Allison <j...@samba.org> Autobuild-Date(master): Wed May 13 22:01:14 CEST 2015 on sn-devel-104 commit 0f9f5bab27e61e5498530195c923616c017cf5b7 Author: Richard Sharpe <rsha...@samba.org> Date: Sun May 10 18:17:56 2015 -0700 Convert all uses of uint32/16/8 to _t in source3/auth. Signed-off-by: Richard Sharpe <rsha...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 0674ddcb5f0eb15c893a1ed9c467d57ab337924a Author: Richard Sharpe <rsha...@samba.org> Date: Sat May 9 19:58:40 2015 -0700 Convert uint32/16/8 to _t in source3/libnet. Signed-off-by: Richard Sharpe <rsha...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 589c7bc6d65b16045d6e4ace5930afc59144fa8a Author: Richard Sharpe <rsha...@samba.org> Date: Sat May 9 19:49:09 2015 -0700 Convert all uint32/16/8 to _t in source3/client. Signed-off-by: Richard Sharpe <rsha...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 63e1352fec642ea9173f069fbc9e010129ac2459 Author: Richard Sharpe <rsha...@samba.org> Date: Sat May 9 17:06:28 2015 -0700 Convert a couple of uint32s to _t that I missed in source3/utils. Signed-off-by: Richard Sharpe <rsha...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 5c1f8adc331a33c8fdd8e3995284d5833dc29f38 Author: Richard Sharpe <rsha...@samba.org> Date: Sat May 9 16:59:45 2015 -0700 Convert all uint32/16/8 to _t in source3/libsmb. Signed-off-by: Richard Sharpe <rsha...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit dffe228283ba756d4370753a1e2aed3cee3acccd Author: Richard Sharpe <rsha...@samba.org> Date: Sat May 9 16:33:10 2015 -0700 Convert all uint32/16/8 to _t in source3/lib. Signed-off-by: Richard Sharpe <rsha...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit c833baa24cb87471a23b703a7576b8584129ed79 Author: Richard Sharpe <rsha...@samba.org> Date: Sat May 9 16:14:39 2015 -0700 Convert all uint32/16/8 to _t in source3/locking. Signed-off-by: Richard Sharpe <rsha...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> commit 9432e2032752f4e78b1bd9354f48a3c9affbed94 Author: Volker Lendecke <v...@samba.org> Date: Wed May 13 08:53:43 2015 +0200 namequery: namequery: suppress bogus warning "resolve_name: unknown name switch type" Based on a patch by Uri Simchoni <urisimch...@gmail.com> Signed-off-by: Volker Lendecke <v...@samba.org> Reviewed-by: Jeremy Allison <j...@samba.org> ----------------------------------------------------------------------- Summary of changes: source3/auth/auth_util.c | 6 ++-- source3/auth/check_samsec.c | 6 ++-- source3/auth/proto.h | 8 ++--- source3/client/client.c | 42 +++++++++++----------- source3/client/client_proto.h | 2 +- source3/client/clitar.c | 8 ++--- source3/client/tree.c | 4 +-- source3/include/client.h | 6 ++-- source3/lib/ctdbd_conn.c | 4 +-- source3/lib/events.c | 2 +- source3/lib/messages.c | 6 ++-- source3/lib/popt_common.c | 2 +- source3/lib/sysquotas_4A.c | 6 ++-- source3/lib/sysquotas_linux.c | 20 +++++------ source3/lib/sysquotas_nfs.c | 2 +- source3/lib/sysquotas_xfs.c | 4 +-- source3/lib/system.c | 8 ++--- source3/lib/util.c | 4 +-- source3/lib/util_ea.c | 2 +- source3/lib/util_sd.c | 10 +++--- source3/lib/util_tdb.c | 40 ++++++++++----------- source3/lib/util_wellknown.c | 4 +-- source3/lib/winbind_util.c | 4 +-- source3/lib/winbind_util.h | 2 +- source3/libnet/libnet_samsync_ldif.c | 12 +++---- source3/libnet/libnet_samsync_passdb.c | 6 ++-- source3/libsmb/cliconnect.c | 8 ++--- source3/libsmb/clidgram.c | 2 +- source3/libsmb/clientgen.c | 2 +- source3/libsmb/clierror.c | 6 ++-- source3/libsmb/clifsinfo.c | 22 ++++++------ source3/libsmb/clilist.c | 6 ++-- source3/libsmb/clirap.c | 26 +++++++------- source3/libsmb/clirap.h | 48 ++++++++++++------------- source3/libsmb/clirap2.c | 30 ++++++++-------- source3/libsmb/clisecdesc.c | 4 +-- source3/libsmb/libsmb_dir.c | 18 +++++----- source3/libsmb/libsmb_file.c | 6 ++-- source3/libsmb/libsmb_misc.c | 4 +-- source3/libsmb/libsmb_server.c | 2 +- source3/libsmb/libsmb_stat.c | 10 +++--- source3/libsmb/libsmb_xattr.c | 14 ++++---- source3/libsmb/namequery.c | 65 +++++++++++++++++++++++++--------- source3/libsmb/nmblib.c | 2 +- source3/libsmb/proto.h | 26 +++++++------- source3/libsmb/samlogon_cache.c | 2 +- source3/libsmb/smb_share_modes.c | 18 +++++----- source3/libsmb/smbsock_connect.c | 2 +- source3/locking/brlock.c | 6 ++-- source3/locking/locking.c | 4 +-- source3/locking/posix.c | 2 +- source3/nmbd/nmbd_proto.h | 22 ++++++------ source3/torture/proto.h | 2 +- source3/utils/net_groupmap.c | 2 +- 54 files changed, 307 insertions(+), 274 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/auth/auth_util.c b/source3/auth/auth_util.c index 585afd3..69e150f 100644 --- a/source3/auth/auth_util.c +++ b/source3/auth/auth_util.c @@ -167,7 +167,7 @@ bool make_user_info_netlogon_network(TALLOC_CTX *mem_ctx, const char *client_domain, const char *workstation_name, const struct tsocket_address *remote_address, - uint32 logon_parameters, + uint32_t logon_parameters, const uchar *lm_network_pwd, int lm_pwd_len, const uchar *nt_network_pwd, @@ -208,7 +208,7 @@ bool make_user_info_netlogon_interactive(TALLOC_CTX *mem_ctx, const char *client_domain, const char *workstation_name, const struct tsocket_address *remote_address, - uint32 logon_parameters, + uint32_t logon_parameters, const uchar chal[8], const uchar lm_interactive_pwd[16], const uchar nt_interactive_pwd[16]) @@ -280,7 +280,7 @@ bool make_user_info_for_reply(TALLOC_CTX *mem_ctx, const char *smb_name, const char *client_domain, const struct tsocket_address *remote_address, - const uint8 chal[8], + const uint8_t chal[8], DATA_BLOB plaintext_password) { diff --git a/source3/auth/check_samsec.c b/source3/auth/check_samsec.c index ff634aa..cbcde08 100644 --- a/source3/auth/check_samsec.c +++ b/source3/auth/check_samsec.c @@ -119,11 +119,11 @@ static NTSTATUS sam_password_ok(TALLOC_CTX *mem_ctx, static bool logon_hours_ok(struct samu *sampass) { /* In logon hours first bit is Sunday from 12AM to 1AM */ - const uint8 *hours; + const uint8_t *hours; struct tm *utctime; time_t lasttime; const char *asct; - uint8 bitmask, bitpos; + uint8_t bitmask, bitpos; hours = pdb_get_hours(sampass); if (!hours) { @@ -176,7 +176,7 @@ static NTSTATUS sam_account_ok(TALLOC_CTX *mem_ctx, struct samu *sampass, const struct auth_usersupplied_info *user_info) { - uint32 acct_ctrl = pdb_get_acct_ctrl(sampass); + uint32_t acct_ctrl = pdb_get_acct_ctrl(sampass); char *workstation_list; time_t kickoff_time; diff --git a/source3/auth/proto.h b/source3/auth/proto.h index 792e96d..5fd3158 100644 --- a/source3/auth/proto.h +++ b/source3/auth/proto.h @@ -165,7 +165,7 @@ bool make_user_info_netlogon_network(TALLOC_CTX *mem_ctx, const char *client_domain, const char *workstation_name, const struct tsocket_address *remote_address, - uint32 logon_parameters, + uint32_t logon_parameters, const uchar *lm_network_pwd, int lm_pwd_len, const uchar *nt_network_pwd, @@ -176,7 +176,7 @@ bool make_user_info_netlogon_interactive(TALLOC_CTX *mem_ctx, const char *client_domain, const char *workstation_name, const struct tsocket_address *remote_address, - uint32 logon_parameters, + uint32_t logon_parameters, const uchar chal[8], const uchar lm_interactive_pwd[16], const uchar nt_interactive_pwd[16]); @@ -185,7 +185,7 @@ bool make_user_info_for_reply(TALLOC_CTX *mem_ctx, const char *smb_name, const char *client_domain, const struct tsocket_address *remote_address, - const uint8 chal[8], + const uint8_t chal[8], DATA_BLOB plaintext_password); NTSTATUS make_user_info_for_reply_enc(TALLOC_CTX *mem_ctx, struct auth_usersupplied_info **user_info, @@ -336,7 +336,7 @@ NTSTATUS pass_check(const struct passwd *pass, /* The following definitions come from auth/token_util.c */ bool nt_token_check_sid ( const struct dom_sid *sid, const struct security_token *token ); -bool nt_token_check_domain_rid( struct security_token *token, uint32 rid ); +bool nt_token_check_domain_rid( struct security_token *token, uint32_t rid ); struct security_token *get_root_nt_token( void ); NTSTATUS add_aliases(const struct dom_sid *domain_sid, struct security_token *token); diff --git a/source3/client/client.c b/source3/client/client.c index 4f24f37..fde5b49 100644 --- a/source3/client/client.c +++ b/source3/client/client.c @@ -360,7 +360,7 @@ static int do_cd(const char *new_dir) char *targetpath = NULL; struct cli_state *targetcli = NULL; SMB_STRUCT_STAT sbuf; - uint32 attributes; + uint32_t attributes; int ret = 1; TALLOC_CTX *ctx = talloc_stackframe(); NTSTATUS status; @@ -813,7 +813,7 @@ static NTSTATUS do_list_helper(const char *mntpoint, struct file_info *f, ****************************************************************************/ NTSTATUS do_list(const char *mask, - uint16 attribute, + uint16_t attribute, NTSTATUS (*fn)(struct cli_state *cli_state, struct file_info *, const char *dir), bool rec, @@ -929,7 +929,7 @@ NTSTATUS do_list(const char *mask, static int cmd_dir(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; + uint16_t attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; char *mask = NULL; char *buf = NULL; int rc = 1; @@ -979,7 +979,7 @@ static int cmd_dir(void) static int cmd_du(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; + uint16_t attribute = FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; char *mask = NULL; char *buf = NULL; NTSTATUS status; @@ -1063,7 +1063,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget) uint16_t fnum; bool newhandle = false; struct timespec tp_start; - uint16 attr; + uint16_t attr; off_t size; off_t start = 0; off_t nread = 0; @@ -1158,7 +1158,7 @@ static int do_get(const char *rname, const char *lname_in, bool reget) } if (archive_level >= 2 && (attr & FILE_ATTRIBUTE_ARCHIVE)) { - cli_setatr(cli, rname, attr & ~(uint16)FILE_ATTRIBUTE_ARCHIVE, 0); + cli_setatr(cli, rname, attr & ~(uint16_t)FILE_ATTRIBUTE_ARCHIVE, 0); } { @@ -1419,7 +1419,7 @@ static int cmd_more(void) static int cmd_mget(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; + uint16_t attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; char *mget_mask = NULL; char *buf = NULL; NTSTATUS status = NT_STATUS_OK; @@ -2390,7 +2390,7 @@ static int cmd_del(void) char *mask = NULL; char *buf = NULL; NTSTATUS status = NT_STATUS_OK; - uint16 attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; + uint16_t attribute = FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN; if (recurse) { attribute |= FILE_ATTRIBUTE_DIRECTORY; @@ -2425,7 +2425,7 @@ static int cmd_wdel(void) TALLOC_CTX *ctx = talloc_tos(); char *mask = NULL; char *buf = NULL; - uint16 attribute; + uint16_t attribute; struct cli_state *targetcli; char *targetname = NULL; NTSTATUS status; @@ -2435,7 +2435,7 @@ static int cmd_wdel(void) return 1; } - attribute = (uint16)strtol(buf, (char **)NULL, 16); + attribute = (uint16_t)strtol(buf, (char **)NULL, 16); if (!next_token_talloc(ctx, &cmd_ptr,&buf,NULL)) { d_printf("wdel 0x<attrib> <wcard>\n"); @@ -2767,8 +2767,8 @@ static int cmd_close(void) static int cmd_posix(void) { TALLOC_CTX *ctx = talloc_tos(); - uint16 major, minor; - uint32 caplow, caphigh; + uint16_t major, minor; + uint32_t caplow, caphigh; char *caps; NTSTATUS status; @@ -3321,14 +3321,14 @@ static int cmd_getfacl(void) char *name = NULL; char *targetname = NULL; struct cli_state *targetcli; - uint16 major, minor; - uint32 caplow, caphigh; + uint16_t major, minor; + uint32_t caplow, caphigh; char *retbuf = NULL; size_t rb_size = 0; SMB_STRUCT_STAT sbuf; - uint16 num_file_acls = 0; - uint16 num_dir_acls = 0; - uint16 i; + uint16_t num_file_acls = 0; + uint16_t num_dir_acls = 0; + uint16_t i; NTSTATUS status; if (!next_token_talloc(ctx, &cmd_ptr,&name,NULL)) { @@ -3408,7 +3408,7 @@ static int cmd_getfacl(void) } for (i = 0; i < num_file_acls; i++) { - uint32 uorg; + uint32_t uorg; fstring permstring; unsigned char tagtype = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+(i*SMB_POSIX_ACL_ENTRY_SIZE)); unsigned char perms = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+(i*SMB_POSIX_ACL_ENTRY_SIZE)+1); @@ -3445,7 +3445,7 @@ static int cmd_getfacl(void) } for (i = 0; i < num_dir_acls; i++) { - uint32 uorg; + uint32_t uorg; fstring permstring; unsigned char tagtype = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+((i+num_file_acls)*SMB_POSIX_ACL_ENTRY_SIZE)); unsigned char perms = CVAL(retbuf, SMB_POSIX_ACL_HEADER_SIZE+((i+num_file_acls)*SMB_POSIX_ACL_ENTRY_SIZE)+1); @@ -4181,7 +4181,7 @@ static int cmd_reput(void) List a share name. ****************************************************************************/ -static void browse_fn(const char *name, uint32 m, +static void browse_fn(const char *name, uint32_t m, const char *comment, void *state) { const char *typestr = ""; @@ -4295,7 +4295,7 @@ static bool browse_host(bool sort) List a server name. ****************************************************************************/ -static void server_fn(const char *name, uint32 m, +static void server_fn(const char *name, uint32_t m, const char *comment, void *state) { diff --git a/source3/client/client_proto.h b/source3/client/client_proto.h index 3e91ff0..86f1d18 100644 --- a/source3/client/client_proto.h +++ b/source3/client/client_proto.h @@ -31,7 +31,7 @@ struct file_info; const char *client_get_cur_dir(void); const char *client_set_cur_dir(const char *newdir); NTSTATUS do_list(const char *mask, - uint16 attribute, + uint16_t attribute, NTSTATUS (*fn)(struct cli_state *cli_state, struct file_info *, const char *dir), bool rec, diff --git a/source3/client/clitar.c b/source3/client/clitar.c index e4d391a..5561845 100644 --- a/source3/client/clitar.c +++ b/source3/client/clitar.c @@ -216,7 +216,7 @@ static int make_remote_path(const char *full_path); static int max_token (const char *str); static NTSTATUS is_subpath(const char *sub, const char *full, bool *_subpath_match); -static int set_remote_attr(const char *filename, uint16 new_attr, int mode); +static int set_remote_attr(const char *filename, uint16_t new_attr, int mode); /** * tar_get_ctx - retrieve global tar context handle @@ -394,7 +394,7 @@ int cmd_setmode(void) const extern char *cmd_ptr; char *buf; char *fname = NULL; - uint16 attr[2] = {0}; + uint16_t attr[2] = {0}; int mode = ATTR_SET; int err = 0; bool ok; @@ -1639,10 +1639,10 @@ out: * * Update the file attributes with the one provided. */ -static int set_remote_attr(const char *filename, uint16 new_attr, int mode) +static int set_remote_attr(const char *filename, uint16_t new_attr, int mode) { extern struct cli_state *cli; - uint16 old_attr; + uint16_t old_attr; NTSTATUS status; status = cli_getatr(cli, filename, &old_attr, NULL, NULL); diff --git a/source3/client/tree.c b/source3/client/tree.c index e0b8c91..0e51f61 100644 --- a/source3/client/tree.c +++ b/source3/client/tree.c @@ -30,7 +30,7 @@ static GtkWidget *clist; struct tree_data { - guint32 type; /* Type of tree item, an SMBC_TYPE */ + guint32_t type; /* Type of tree item, an SMBC_TYPE */ char name[256]; /* May need to change this later */ }; @@ -128,7 +128,7 @@ char *get_path(TALLOC_CTX *ctx, GtkWidget *item) } -struct tree_data *make_tree_data(guint32 type, const char *name) +struct tree_data *make_tree_data(guint32_t type, const char *name) { struct tree_data *p = SMB_MALLOC_P(struct tree_data); diff --git a/source3/include/client.h b/source3/include/client.h index 25c44ba..0024c04 100644 --- a/source3/include/client.h +++ b/source3/include/client.h @@ -32,8 +32,8 @@ */ struct print_job_info { - uint16 id; - uint16 priority; + uint16_t id; + uint16_t priority; size_t size; fstring user; fstring name; @@ -106,7 +106,7 @@ struct cli_state { struct file_info { uint64_t size; - uint16 mode; + uint16_t mode; uid_t uid; gid_t gid; /* these times are normally kept in GMT */ diff --git a/source3/lib/ctdbd_conn.c b/source3/lib/ctdbd_conn.c index 748a99f..1285e4b 100644 --- a/source3/lib/ctdbd_conn.c +++ b/source3/lib/ctdbd_conn.c @@ -699,7 +699,7 @@ static NTSTATUS ctdb_handle_message(struct messaging_context *msg_ctx, static void ctdbd_socket_handler(struct tevent_context *event_ctx, struct tevent_fd *event, - uint16 flags, + uint16_t flags, void *private_data) { struct ctdbd_connection *conn = talloc_get_type_abort( @@ -887,7 +887,7 @@ static NTSTATUS ctdbd_control(struct ctdbd_connection *conn, reply = (struct ctdb_reply_control *)hdr; if (outdata) { - if (!(outdata->dptr = (uint8 *)talloc_memdup( + if (!(outdata->dptr = (uint8_t *)talloc_memdup( mem_ctx, reply->data, reply->datalen))) { TALLOC_FREE(reply); return NT_STATUS_NO_MEMORY; diff --git a/source3/lib/events.c b/source3/lib/events.c index 62aa4d9..0bc56e4 100644 --- a/source3/lib/events.c +++ b/source3/lib/events.c @@ -212,7 +212,7 @@ bool run_events_poll(struct tevent_context *ev, int pollrtn, for (fde = ev->fd_events; fde; fde = fde->next) { struct pollfd *pfd; - uint16 flags = 0; + uint16_t flags = 0; if ((fde->flags & (TEVENT_FD_READ|TEVENT_FD_WRITE)) == 0) { continue; diff --git a/source3/lib/messages.c b/source3/lib/messages.c index f0d2797..51e88e2 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -59,7 +59,7 @@ struct messaging_callback { struct messaging_callback *prev, *next; - uint32 msg_type; + uint32_t msg_type; void (*fn)(struct messaging_context *msg, void *private_data, uint32_t msg_type, struct server_id server_id, DATA_BLOB *data); @@ -112,7 +112,7 @@ static void ping_message(struct messaging_context *msg_ctx, struct msg_all { struct messaging_context *msg_ctx; int msg_type; - uint32 msg_flag; + uint32_t msg_flag; const void *buf; size_t len; int n_sent; @@ -243,7 +243,7 @@ static void messaging_recv_cb(const uint8_t *msg, size_t msg_len, rec = (struct messaging_rec) { .msg_version = MESSAGE_VERSION, - .buf.data = discard_const_p(uint8, msg) + sizeof(hdr), + .buf.data = discard_const_p(uint8_t, msg) + sizeof(hdr), .buf.length = msg_len - sizeof(hdr), .num_fds = num_fds, .fds = fds64, diff --git a/source3/lib/popt_common.c b/source3/lib/popt_common.c index 44f6aae..c2a95d7 100644 --- a/source3/lib/popt_common.c +++ b/source3/lib/popt_common.c @@ -286,7 +286,7 @@ static void get_credentials_file(struct user_auth_info *auth_info, { XFILE *auth; fstring buf; - uint16 len = 0; + uint16_t len = 0; char *ptr, *val, *param; if ((auth=x_fopen(file, O_RDONLY, 0)) == NULL) diff --git a/source3/lib/sysquotas_4A.c b/source3/lib/sysquotas_4A.c index 8a1b122..244b612 100644 --- a/source3/lib/sysquotas_4A.c +++ b/source3/lib/sysquotas_4A.c @@ -87,7 +87,7 @@ int sys_get_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp) { int ret = -1; - uint32 qflags = 0; + uint32_t qflags = 0; struct dqblk D; uint64_t bsize = (uint64_t)QUOTABLOCK_SIZE; @@ -181,8 +181,8 @@ int sys_get_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qt int sys_set_vfs_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp) { int ret = -1; - uint32 qflags = 0; - uint32 oldqflags = 0; + uint32_t qflags = 0; + uint32_t oldqflags = 0; struct dqblk D; uint64_t bsize = (uint64_t)QUOTABLOCK_SIZE; diff --git a/source3/lib/sysquotas_linux.c b/source3/lib/sysquotas_linux.c index 5720328..68b9f90 100644 --- a/source3/lib/sysquotas_linux.c +++ b/source3/lib/sysquotas_linux.c @@ -39,7 +39,7 @@ static int sys_get_linux_v1_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp) { int ret = -1; - uint32 qflags = 0; + uint32_t qflags = 0; struct v1_kern_dqblk D; uint64_t bsize = (uint64_t)QUOTABLOCK_SIZE; @@ -107,8 +107,8 @@ static int sys_get_linux_v1_quota(const char *path, const char *bdev, enum SMB_Q static int sys_set_linux_v1_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp) { int ret = -1; - uint32 qflags = 0; - uint32 oldqflags = 0; + uint32_t qflags = 0; + uint32_t oldqflags = 0; struct v1_kern_dqblk D; uint64_t bsize = (uint64_t)QUOTABLOCK_SIZE; @@ -173,7 +173,7 @@ static int sys_set_linux_v1_quota(const char *path, const char *bdev, enum SMB_Q static int sys_get_linux_v2_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp) { int ret = -1; - uint32 qflags = 0; + uint32_t qflags = 0; struct v2_kern_dqblk D; uint64_t bsize = (uint64_t)QUOTABLOCK_SIZE; @@ -241,8 +241,8 @@ static int sys_get_linux_v2_quota(const char *path, const char *bdev, enum SMB_Q static int sys_set_linux_v2_quota(const char *path, const char *bdev, enum SMB_QUOTA_TYPE qtype, unid_t id, SMB_DISK_QUOTA *dp) { int ret = -1; - uint32 qflags = 0; - uint32 oldqflags = 0; + uint32_t qflags = 0; + uint32_t oldqflags = 0; struct v2_kern_dqblk D; uint64_t bsize = (uint64_t)QUOTABLOCK_SIZE; -- Samba Shared Repository