The branch, master has been updated
via 704592c Last lot of convert uint32 to uint32_t in winbindd, I
promise.
via 6abd986 Convert all uses of uint8/16/32 to _t in source3/smbd.
via e60cc28 Convert all uint8/16/32 to _t in all modules.
via f9056de lib: Fix indentation
via 7294754 lib: Fix whitespace
from 3278b69 s3:winbindd: list local groups for our internal domains too
(as AD DC)
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 704592c14dfedbe98e95d43860d062dc6338bca3
Author: Richard Sharpe <[email protected]>
Date: Sat May 2 21:07:06 2015 -0700
Last lot of convert uint32 to uint32_t in winbindd, I promise.
Signed-off-by: Richard Sharpe <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
Autobuild-User(master): Jeremy Allison <[email protected]>
Autobuild-Date(master): Wed May 6 07:03:27 CEST 2015 on sn-devel-104
commit 6abd986704291b051af5eeb67f670a0e8cf845fd
Author: Richard Sharpe <[email protected]>
Date: Sat May 2 21:01:14 2015 -0700
Convert all uses of uint8/16/32 to _t in source3/smbd.
Signed-off-by: Richard Sharpe <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit e60cc280d6ba824c53bb91a29b5b24e177eec823
Author: Richard Sharpe <[email protected]>
Date: Sat May 2 20:11:02 2015 -0700
Convert all uint8/16/32 to _t in all modules.
Signed-off-by: Richard Sharpe <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit f9056de9bf5548507579a22778cc25aaba51d3f9
Author: Volker Lendecke <[email protected]>
Date: Tue May 5 08:34:11 2015 +0000
lib: Fix indentation
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
commit 729475425bfd4df9185638036186b016cd2d080c
Author: Volker Lendecke <[email protected]>
Date: Tue May 5 08:32:59 2015 +0000
lib: Fix whitespace
Signed-off-by: Volker Lendecke <[email protected]>
Reviewed-by: Jeremy Allison <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/lib/sysacls.c | 40 ++++++++---------
source3/modules/nfs4_acls.c | 18 ++++----
source3/modules/nfs4_acls.h | 24 +++++-----
source3/modules/vfs_acl_tdb.c | 6 +--
source3/modules/vfs_afsacl.c | 60 ++++++++++++-------------
source3/modules/vfs_aio_linux.c | 4 +-
source3/modules/vfs_aio_pthread.c | 4 +-
source3/modules/vfs_aixacl2.c | 20 ++++-----
source3/modules/vfs_audit.c | 2 +-
source3/modules/vfs_cap.c | 2 +-
source3/modules/vfs_catia.c | 4 +-
source3/modules/vfs_ceph.c | 6 +--
source3/modules/vfs_default_quota.c | 4 +-
source3/modules/vfs_dirsort.c | 4 +-
source3/modules/vfs_extd_audit.c | 2 +-
source3/modules/vfs_fruit.c | 4 +-
source3/modules/vfs_glusterfs.c | 8 ++--
source3/modules/vfs_gpfs.c | 18 ++++----
source3/modules/vfs_media_harmony.c | 6 +--
source3/modules/vfs_netatalk.c | 4 +-
source3/modules/vfs_nfs4acl_xattr.c | 16 +++----
source3/modules/vfs_notify_fam.c | 6 +--
source3/modules/vfs_scannedonly.c | 4 +-
source3/modules/vfs_shadow_copy2.c | 6 +--
source3/modules/vfs_snapper.c | 4 +-
source3/modules/vfs_streams_depot.c | 2 +-
source3/modules/vfs_streams_xattr.c | 8 ++--
source3/modules/vfs_unityed_media.c | 6 +--
source3/modules/vfs_zfsacl.c | 16 +++----
source3/smbd/blocking.c | 8 ++--
source3/smbd/dir.c | 20 ++++-----
source3/smbd/dmapi.c | 6 +--
source3/smbd/dosmode.c | 18 ++++----
source3/smbd/error.c | 10 ++---
source3/smbd/file_access.c | 2 +-
source3/smbd/files.c | 8 ++--
source3/smbd/globals.h | 4 +-
source3/smbd/ipc.c | 8 ++--
source3/smbd/negprot.c | 16 +++----
source3/smbd/notify.c | 20 ++++-----
source3/smbd/open.c | 4 +-
source3/smbd/oplock.c | 8 ++--
source3/smbd/pipes.c | 2 +-
source3/smbd/posix_acls.c | 36 +++++++--------
source3/smbd/process.c | 12 ++---
source3/smbd/proto.h | 86 ++++++++++++++++++------------------
source3/smbd/pysmbd.c | 4 +-
source3/smbd/reply.c | 8 ++--
source3/smbd/server.c | 2 +-
source3/smbd/service.c | 2 +-
source3/smbd/sesssetup.c | 16 +++----
source3/smbd/smbd.h | 12 ++---
source3/smbd/srvstr.c | 8 ++--
source3/smbd/trans2.c | 28 ++++++------
source3/winbindd/winbindd.c | 4 +-
source3/winbindd/winbindd.h | 2 +-
source3/winbindd/winbindd_ads.c | 4 +-
source3/winbindd/winbindd_cache.c | 4 +-
source3/winbindd/winbindd_creds.c | 4 +-
source3/winbindd/winbindd_dual.c | 2 +-
source3/winbindd/winbindd_getgrnam.c | 2 +-
source3/winbindd/winbindd_proto.h | 16 +++----
62 files changed, 347 insertions(+), 347 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/sysacls.c b/source3/lib/sysacls.c
index 2ec3d68..7cff488 100644
--- a/source3/lib/sysacls.c
+++ b/source3/lib/sysacls.c
@@ -1,20 +1,20 @@
-/*
+/*
Unix SMB/CIFS implementation.
Samba system utilities for ACL support.
Copyright (C) Jeremy Allison 2000.
Copyright (C) Volker Lendecke 2006
Copyright (C) Michael Adam 2006,2008
-
+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
-
+
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
+
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
@@ -104,14 +104,14 @@ void *sys_acl_get_qualifier(SMB_ACL_ENTRY_T entry_d)
{
if (entry_d->a_type == SMB_ACL_USER) {
return &entry_d->info.user.uid;
- }
+ }
if (entry_d->a_type == SMB_ACL_GROUP) {
return &entry_d->info.group.gid;
}
errno = EINVAL;
- return NULL;
+ return NULL;
}
int sys_acl_clear_perms(SMB_ACL_PERMSET_T permset_d)
@@ -127,15 +127,15 @@ int sys_acl_add_perm(SMB_ACL_PERMSET_T permset_d,
SMB_ACL_PERM_T perm)
&& perm != SMB_ACL_EXECUTE) {
errno = EINVAL;
return -1;
- }
-
+ }
+
if (permset_d == NULL) {
errno = EINVAL;
return -1;
}
*permset_d |= perm;
-
+
return 0;
}
@@ -183,7 +183,7 @@ char *sys_acl_to_text(const struct smb_acl_t *acl_d,
ssize_t *len_p)
ap->a_type);
tag = tagbuf;
break;
-
+
case SMB_ACL_USER:
id = uidtoname(ap->info.user.uid);
/* FALL TROUGH */
@@ -255,7 +255,7 @@ SMB_ACL_T sys_acl_init(TALLOC_CTX *mem_ctx)
errno = ENOMEM;
return NULL;
}
-
+
a->count = 0;
a->next = -1;
@@ -319,7 +319,7 @@ int sys_acl_set_qualifier(SMB_ACL_ENTRY_T entry_d, void
*qual_p)
if (entry_d->a_type == SMB_ACL_USER) {
entry_d->info.user.uid = *((uid_t *)qual_p);
return 0;
- }
+ }
if (entry_d->a_type == SMB_ACL_GROUP) {
entry_d->info.group.gid = *((gid_t *)qual_p);
return 0;
@@ -337,7 +337,7 @@ int sys_acl_set_permset(SMB_ACL_ENTRY_T entry_d,
SMB_ACL_PERMSET_T permset_d)
}
entry_d->a_perm = *permset_d;
-
+
return 0;
}
@@ -358,26 +358,26 @@ int sys_acl_valid(SMB_ACL_T acl_d)
* sys_acl_delete_def_file are to be redirected to the default
* statically-bound acl vfs module, but they are replacable.
*/
-
+
#if defined(HAVE_POSIX_ACLS)
-
-SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
+
+SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
const char *path_p, SMB_ACL_TYPE_T type, TALLOC_CTX
*mem_ctx)
{
return posixacl_sys_acl_get_file(handle, path_p, type, mem_ctx);
}
-
+
SMB_ACL_T sys_acl_get_fd(vfs_handle_struct *handle, files_struct *fsp,
TALLOC_CTX *mem_ctx)
{
return posixacl_sys_acl_get_fd(handle, fsp, mem_ctx);
}
-
+
int sys_acl_set_file(vfs_handle_struct *handle,
const char *name, SMB_ACL_TYPE_T type, SMB_ACL_T acl_d)
{
return posixacl_sys_acl_set_file(handle, name, type, acl_d);
}
-
+
int sys_acl_set_fd(vfs_handle_struct *handle, files_struct *fsp,
SMB_ACL_T acl_d)
{
@@ -424,7 +424,7 @@ int sys_acl_delete_def_file(vfs_handle_struct *handle,
}
#elif defined(HAVE_TRU64_ACLS)
-
+
SMB_ACL_T sys_acl_get_file(vfs_handle_struct *handle,
const char *path_p, SMB_ACL_TYPE_T type,
TALLOC_CTX *mem_ctx)
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index f7daa8d..9475248 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -40,7 +40,7 @@ extern const struct generic_mapping file_generic_mapping;
#define SMB_ACE4_INT_MAGIC 0x76F8A967
typedef struct _SMB_ACE4_INT_T
{
- uint32 magic;
+ uint32_t magic;
SMB_ACE4PROP_T prop;
void *next;
} SMB_ACE4_INT_T;
@@ -48,9 +48,9 @@ typedef struct _SMB_ACE4_INT_T
#define SMB_ACL4_INT_MAGIC 0x29A3E792
typedef struct _SMB_ACL4_INT_T
{
- uint32 magic;
+ uint32_t magic;
uint16_t controlflags;
- uint32 naces;
+ uint32_t naces;
SMB_ACE4_INT_T *first;
SMB_ACE4_INT_T *last;
} SMB_ACL4_INT_T;
@@ -281,7 +281,7 @@ SMB4ACE_T *smb_first_ace4(SMB4ACL_T *theacl)
return (SMB4ACE_T *)aclint->first;
}
-uint32 smb_get_naces(SMB4ACL_T *theacl)
+uint32_t smb_get_naces(SMB4ACL_T *theacl)
{
SMB_ACL4_INT_T *aclint = get_validated_aclint(theacl);
if (aclint==NULL)
@@ -525,7 +525,7 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx,
static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf,
smbacl4_vfs_params *params,
- uint32 security_info,
+ uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc,
SMB4ACL_T *theacl)
@@ -583,7 +583,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const
SMB_STRUCT_STAT *sbuf,
}
NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
- uint32 security_info,
+ uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc,
SMB4ACL_T *theacl)
@@ -608,7 +608,7 @@ NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
NTSTATUS smb_get_nt_acl_nfs4(struct connection_struct *conn,
const char *name,
- uint32 security_info,
+ uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc,
SMB4ACL_T *theacl)
@@ -915,7 +915,7 @@ static SMB4ACL_T *smbacl4_win2nfs4(
)
{
SMB4ACL_T *theacl;
- uint32 i;
+ uint32_t i;
const char *filename = fsp->fsp_name->base_name;
DEBUG(10, ("smbacl4_win2nfs4 invoked\n"));
@@ -959,7 +959,7 @@ static SMB4ACL_T *smbacl4_win2nfs4(
}
NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
- uint32 security_info_sent,
+ uint32_t security_info_sent,
const struct security_descriptor *psd,
set_nfs4acl_native_fn_t set_nfs4_native)
{
diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h
index 68abebf..1922010 100644
--- a/source3/modules/nfs4_acls.h
+++ b/source3/modules/nfs4_acls.h
@@ -31,9 +31,9 @@
* used in the NFS4 ACL structures.
*/
typedef union _SMB_NFS4_ACEWHOID_T {
- uid_t uid; /* User id */
- gid_t gid; /* Group id */
- uint32 special_id; /* Identifies special identities in NFS4 */
+ uid_t uid; /* User id */
+ gid_t gid; /* Group id */
+ uint32_t special_id; /* Identifies special identities in NFS4 */
#define SMB_ACE4_WHO_OWNER 0x00000001 /*The owner of the file. */
#define SMB_ACE4_WHO_GROUP 0x00000002 /*The group associated with the
file. */
@@ -46,11 +46,11 @@ typedef union _SMB_NFS4_ACEWHOID_T {
#define SMB_ACE4_WHO_AUTHENTICATED 0x00000009 /*Any authenticated user
(opposite of ANONYMOUS) */
#define SMB_ACE4_WHO_SERVICE 0x0000000A /*Access from a system service.
*/
#define SMB_ACE4_WHO_MAX SMB_ACE4_WHO_SERVICE /* largest valid
ACE4_WHO */
- uint32 id;
+ uint32_t id;
} SMB_NFS4_ACEWHOID_T;
typedef struct _SMB_ACE4PROP_T {
- uint32 flags; /* Bit mask defining details of ACE */
+ uint32_t flags; /* Bit mask defining details of ACE */
/*The following are constants for flags field */
/* #define SMB_ACE4_ID_NOT_VALID 0x00000001 - from aix/jfs2 */
#define SMB_ACE4_ID_SPECIAL 0x00000002
@@ -59,7 +59,7 @@ typedef struct _SMB_ACE4PROP_T {
/* The following part of ACE has the same layout as NFSv4 wire format.
*/
- uint32 aceType; /* Type of ACE PERMIT/ALLOW etc*/
+ uint32_t aceType; /* Type of ACE PERMIT/ALLOW etc*/
/*The constants used for the type field (acetype4) are as follows: */
#define SMB_ACE4_ACCESS_ALLOWED_ACE_TYPE 0x00000000
#define SMB_ACE4_ACCESS_DENIED_ACE_TYPE 0x00000001
@@ -67,7 +67,7 @@ typedef struct _SMB_ACE4PROP_T {
#define SMB_ACE4_SYSTEM_ALARM_ACE_TYPE 0x00000003
#define SMB_ACE4_MAX_TYPE ACE4_SYSTEM_ALARM_ACE_TYPE /* largest valid
ACE4_TYPE */
- uint32 aceFlags; /* Controls Inheritance and such */
+ uint32_t aceFlags; /* Controls Inheritance and such */
/*The bitmask constants used for the flag field are as follows: */
#define SMB_ACE4_FILE_INHERIT_ACE 0x00000001
#define SMB_ACE4_DIRECTORY_INHERIT_ACE 0x00000002
@@ -81,7 +81,7 @@ typedef struct _SMB_ACE4PROP_T {
| SMB_ACE4_NO_PROPAGATE_INHERIT_ACE | SMB_ACE4_INHERIT_ONLY_ACE |
SMB_ACE4_SUCCESSFUL_ACCESS_ACE_FLAG \
| SMB_ACE4_FAILED_ACCESS_ACE_FLAG | SMB_ACE4_IDENTIFIER_GROUP |
SMB_ACE4_INHERITED_ACE)
- uint32 aceMask; /* Access rights */
+ uint32_t aceMask; /* Access rights */
/*The bitmask constants used for the access mask field are as follows: */
#define SMB_ACE4_READ_DATA 0x00000001
#define SMB_ACE4_LIST_DIRECTORY 0x00000001
@@ -128,20 +128,20 @@ SMB4ACE_T *smb_first_ace4(SMB4ACL_T *theacl);
/* Returns NULL in the end - or error */
SMB4ACE_T *smb_next_ace4(SMB4ACE_T *ace);
-uint32 smb_get_naces(SMB4ACL_T *theacl);
+uint32_t smb_get_naces(SMB4ACL_T *theacl);
uint16_t smbacl4_get_controlflags(SMB4ACL_T *theacl);
bool smbacl4_set_controlflags(SMB4ACL_T *theacl, uint16_t controlflags);
NTSTATUS smb_fget_nt_acl_nfs4(files_struct *fsp,
- uint32 security_info,
+ uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc, SMB4ACL_T *theacl);
NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
const char *name,
- uint32 security_info,
+ uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc, SMB4ACL_T *theacl);
@@ -150,7 +150,7 @@ NTSTATUS smb_get_nt_acl_nfs4(connection_struct *conn,
typedef bool (*set_nfs4acl_native_fn_t)(vfs_handle_struct *handle,
files_struct *, SMB4ACL_T *);
NTSTATUS smb_set_nt_acl_nfs4(vfs_handle_struct *handle, files_struct *fsp,
- uint32 security_info_sent,
+ uint32_t security_info_sent,
const struct security_descriptor *psd,
set_nfs4acl_native_fn_t set_nfs4_native);
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index e02993b..1537ba3 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -99,7 +99,7 @@ static struct db_record *acl_tdb_lock(TALLOC_CTX *mem_ctx,
struct db_context *db,
const struct file_id *id)
{
- uint8 id_buf[16];
+ uint8_t id_buf[16];
/* For backwards compatibility only store the dev/inode. */
push_file_id_16((char *)id_buf, id);
@@ -146,7 +146,7 @@ static NTSTATUS get_acl_blob(TALLOC_CTX *ctx,
const char *name,
DATA_BLOB *pblob)
{
- uint8 id_buf[16];
+ uint8_t id_buf[16];
TDB_DATA data;
struct file_id id;
struct db_context *db = acl_db;
@@ -202,7 +202,7 @@ static NTSTATUS store_acl_blob_fsp(vfs_handle_struct
*handle,
files_struct *fsp,
DATA_BLOB *pblob)
{
- uint8 id_buf[16];
+ uint8_t id_buf[16];
struct file_id id;
TDB_DATA data;
struct db_context *db = acl_db;
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index a794e95..aa8de9a 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -52,7 +52,7 @@ struct afs_ace {
char *name;
struct dom_sid sid;
enum lsa_SidType type;
- uint32 rights;
+ uint32_t rights;
struct afs_ace *next;
};
@@ -65,7 +65,7 @@ struct afs_acl {
struct afs_iob {
char *in, *out;
- uint16 in_size, out_size;
+ uint16_t in_size, out_size;
};
@@ -110,7 +110,7 @@ static struct afs_ace *clone_afs_ace(TALLOC_CTX *mem_ctx,
struct afs_ace *ace)
static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
bool positive,
- const char *name, uint32 rights)
+ const char *name, uint32_t rights)
{
struct dom_sid sid;
enum lsa_SidType type;
@@ -193,7 +193,7 @@ static struct afs_ace *new_afs_ace(TALLOC_CTX *mem_ctx,
static void add_afs_ace(struct afs_acl *acl,
bool positive,
- const char *name, uint32 rights)
+ const char *name, uint32_t rights)
{
struct afs_ace *ace;
@@ -262,7 +262,7 @@ static bool parse_afs_acl(struct afs_acl *acl, const char
*acl_str)
const char *namep;
fstring name;
- uint32 rights;
+ uint32_t rights;
char *space;
namep = p;
@@ -333,9 +333,9 @@ static bool unparse_afs_acl(struct afs_acl *acl, char
*acl_str)
return true;
}
-static uint32 afs_to_nt_file_rights(uint32 rights)
+static uint32_t afs_to_nt_file_rights(uint32_t rights)
{
- uint32 result = 0;
+ uint32_t result = 0;
if (rights & PRSFS_READ)
result |= FILE_READ_DATA | FILE_READ_EA |
@@ -355,8 +355,8 @@ static uint32 afs_to_nt_file_rights(uint32 rights)
return result;
}
-static void afs_to_nt_dir_rights(uint32 afs_rights, uint32 *nt_rights,
- uint8 *flag)
+static void afs_to_nt_dir_rights(uint32_t afs_rights, uint32_t *nt_rights,
+ uint8_t *flag)
{
*nt_rights = 0;
*flag = SEC_ACE_FLAG_OBJECT_INHERIT |
@@ -475,10 +475,10 @@ static void merge_afs_acls(struct afs_acl *dir_acl,
#define PERMS_FULL 0x001f01ff
static struct static_dir_ace_mapping {
- uint8 type;
- uint8 flags;
- uint32 mask;
- uint32 afs_rights;
+ uint8_t type;
+ uint8_t flags;
+ uint32_t mask;
+ uint32_t afs_rights;
} ace_mappings[] = {
/* Full control */
@@ -532,11 +532,11 @@ static struct static_dir_ace_mapping {
{ 0, 0, 0, 9999 }
};
-static uint32 nt_to_afs_dir_rights(const char *filename, const struct
security_ace *ace)
+static uint32_t nt_to_afs_dir_rights(const char *filename, const struct
security_ace *ace)
{
- uint32 result = 0;
- uint32 rights = ace->access_mask;
- uint8 flags = ace->flags;
+ uint32_t result = 0;
+ uint32_t rights = ace->access_mask;
+ uint8_t flags = ace->flags;
struct static_dir_ace_mapping *m;
@@ -573,10 +573,10 @@ static uint32 nt_to_afs_dir_rights(const char *filename,
const struct security_a
return result;
}
-static uint32 nt_to_afs_file_rights(const char *filename, const struct
security_ace *ace)
+static uint32_t nt_to_afs_file_rights(const char *filename, const struct
security_ace *ace)
{
- uint32 result = 0;
- uint32 rights = ace->access_mask;
+ uint32_t result = 0;
+ uint32_t rights = ace->access_mask;
if (rights & (GENERIC_READ_ACCESS|FILE_READ_DATA)) {
result |= PRSFS_READ;
@@ -591,7 +591,7 @@ static uint32 nt_to_afs_file_rights(const char *filename,
const struct security_
static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
SMB_STRUCT_STAT *psbuf,
- uint32 security_info,
+ uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@@ -620,7 +620,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
while (afs_ace != NULL) {
uint32_t nt_rights;
- uint8 flag = SEC_ACE_FLAG_OBJECT_INHERIT |
+ uint8_t flag = SEC_ACE_FLAG_OBJECT_INHERIT |
SEC_ACE_FLAG_CONTAINER_INHERIT;
if (afs_ace->type == SID_NAME_UNKNOWN) {
@@ -660,7 +660,7 @@ static size_t afs_to_nt_acl_common(struct afs_acl *afs_acl,
static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
struct connection_struct *conn,
struct smb_filename *smb_fname,
- uint32 security_info,
+ uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@@ -682,7 +682,7 @@ static size_t afs_to_nt_acl(struct afs_acl *afs_acl,
static size_t afs_fto_nt_acl(struct afs_acl *afs_acl,
struct files_struct *fsp,
- uint32 security_info,
+ uint32_t security_info,
TALLOC_CTX *mem_ctx,
struct security_descriptor **ppdesc)
{
@@ -727,9 +727,9 @@ static bool mappable_sid(const struct dom_sid *sid)
}
--
Samba Shared Repository
