[SCM] Samba Shared Repository - branch v3-6-test updated
Karolin Seeger
kseeger at samba.org
Wed Jun 1 12:32:59 MDT 2011
The branch, v3-6-test has been updated
via 28f0326 s3:smbcacls: fix parsing of multiple flags
from 330d16f Improve documentation for net rpc trust
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 28f0326b22483cce6cb86cfa9772bc5d4e3b7c5f
Author: Gregor Beck <gbeck at sernet.de>
Date: Thu May 26 10:15:56 2011 +0200
s3:smbcacls: fix parsing of multiple flags
Signed-off-by: Michael Adam <obnox at samba.org>
(cherry picked from commit c967e8fae5babf6e337c0e2b85fc42eccfe9e4c4)
Fix bug #8192
-----------------------------------------------------------------------
Summary of changes:
source3/utils/smbcacls.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/utils/smbcacls.c b/source3/utils/smbcacls.c
index 2fd9a53..1d5789d 100644
--- a/source3/utils/smbcacls.c
+++ b/source3/utils/smbcacls.c
@@ -360,7 +360,12 @@ static bool parse_ace_flags(const char *str, unsigned int *pflags)
return false;
}
- if (*p != '|' && *p != '\0') {
+ switch (*p) {
+ case '|':
+ p++;
+ case '\0':
+ continue;
+ default:
return false;
}
}
--
Samba Shared Repository
More information about the samba-cvs
mailing list