diff options
| author | Christof Schmitt <cs@samba.org> | 2019-07-15 14:43:01 -0700 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2019-08-23 08:59:25 +0000 |
| commit | af3d3b02bbc83471aab93ee48894cd90d7c8591b (patch) | |
| tree | 83e51f26aefc3ff2e56eba317ef8272f09daeea4 /source3/modules | |
| parent | 8f9b1a92f2876c455916fb0cf598c81744ddd2c0 (diff) | |
| download | samba-af3d3b02bbc83471aab93ee48894cd90d7c8591b.tar.gz | |
nfs4_acls: Remove i argument from smbacl4_MergeIgnoreReject
This is only used for logging of a rejected ACL, but does not provide
additional useful information. Remove it to simplify the function a bit.
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14032
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
(cherry picked from commit 44790721e4f2c6ee6f46de7ac88123ce1a9f6e39)
Diffstat (limited to 'source3/modules')
| -rw-r--r-- | source3/modules/nfs4_acls.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 11cb80e9300..2317e0bc8b1 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -765,13 +765,10 @@ static bool smbacl4_fill_ace4( return true; /* OK */ } -static int smbacl4_MergeIgnoreReject( - enum smbacl4_acedup_enum acedup, - struct SMB4ACL_T *theacl, /* may modify it */ - SMB_ACE4PROP_T *ace, /* the "new" ACE */ - bool *paddNewACE, - int i -) +static int smbacl4_MergeIgnoreReject(enum smbacl4_acedup_enum acedup, + struct SMB4ACL_T *theacl, + SMB_ACE4PROP_T *ace, + bool *paddNewACE) { int result = 0; SMB_ACE4PROP_T *ace4found = smbacl4_find_equal_special(theacl, ace); @@ -788,7 +785,7 @@ static int smbacl4_MergeIgnoreReject( *paddNewACE = false; break; case e_reject: /* do an error */ - DEBUG(8, ("ACL rejected by duplicate nt ace#%d\n", i)); + DBG_INFO("ACL rejected by duplicate nt ace.\n"); errno = EINVAL; /* SHOULD be set on any _real_ error */ result = -1; break; @@ -905,7 +902,7 @@ static struct SMB4ACL_T *smbacl4_win2nfs4( if (pparams->acedup!=e_dontcare) { if (smbacl4_MergeIgnoreReject(pparams->acedup, theacl, - &ace_v4, &addNewACE, i)) { + &ace_v4, &addNewACE)) { return NULL; } } |