diff options
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/vfs_afsacl.c | 18 | ||||
| -rw-r--r-- | source3/modules/vfs_scannedonly.c | 3 |
2 files changed, 10 insertions, 11 deletions
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c index 9dd5df87ec..8e61351a1a 100644 --- a/source3/modules/vfs_afsacl.c +++ b/source3/modules/vfs_afsacl.c @@ -417,7 +417,7 @@ static void split_afs_acl(struct afs_acl *acl, static bool same_principal(struct afs_ace *x, struct afs_ace *y) { return ( (x->positive == y->positive) && - (sid_compare(&x->sid, &y->sid) == 0) ); + (dom_sid_compare(&x->sid, &y->sid) == 0) ); } static void merge_afs_acls(struct afs_acl *dir_acl, @@ -699,16 +699,16 @@ static bool mappable_sid(const struct dom_sid *sid) { struct dom_sid domain_sid; - if (sid_compare(sid, &global_sid_Builtin_Administrators) == 0) + if (dom_sid_compare(sid, &global_sid_Builtin_Administrators) == 0) return True; - if (sid_compare(sid, &global_sid_World) == 0) + if (dom_sid_compare(sid, &global_sid_World) == 0) return True; - if (sid_compare(sid, &global_sid_Authenticated_Users) == 0) + if (dom_sid_compare(sid, &global_sid_Authenticated_Users) == 0) return True; - if (sid_compare(sid, &global_sid_Builtin_Backup_Operators) == 0) + if (dom_sid_compare(sid, &global_sid_Builtin_Backup_Operators) == 0) return True; string_to_sid(&domain_sid, "S-1-5-21"); @@ -757,22 +757,22 @@ static bool nt_to_afs_acl(const char *filename, continue; } - if (sid_compare(&ace->trustee, + if (dom_sid_compare(&ace->trustee, &global_sid_Builtin_Administrators) == 0) { name = "system:administrators"; - } else if (sid_compare(&ace->trustee, + } else if (dom_sid_compare(&ace->trustee, &global_sid_World) == 0) { name = "system:anyuser"; - } else if (sid_compare(&ace->trustee, + } else if (dom_sid_compare(&ace->trustee, &global_sid_Authenticated_Users) == 0) { name = "system:authuser"; - } else if (sid_compare(&ace->trustee, + } else if (dom_sid_compare(&ace->trustee, &global_sid_Builtin_Backup_Operators) == 0) { diff --git a/source3/modules/vfs_scannedonly.c b/source3/modules/vfs_scannedonly.c index b76bef41b4..ab5a7f4e6c 100644 --- a/source3/modules/vfs_scannedonly.c +++ b/source3/modules/vfs_scannedonly.c @@ -476,13 +476,12 @@ static bool scannedonly_allow_access(vfs_handle_struct * handle, flush_sendbuffer(handle); while (retval != 0 /*&& errno == ENOENT */ && i < recheck_tries) { - struct timespec req = { 0, recheck_time * 10000 }; DEBUG(SCANNEDONLY_DEBUG, ("scannedonly_allow_access, wait (try=%d " "(max %d), %d ms) for %s\n", i, recheck_tries, recheck_time, cache_smb_fname->base_name)); - nanosleep(&req, NULL); + smb_msleep(recheck_time); retval = SMB_VFS_NEXT_STAT(handle, cache_smb_fname); i++; } |