git.samba.org
/
samba.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
next_token() was supposed to be a reentrant replacement for strtok(),
[samba.git]
/
source3
/
utils
/
smbcacls.c
diff --git
a/source3/utils/smbcacls.c
b/source3/utils/smbcacls.c
index 4893eb4202b652610fb03b2e07c4765d74e213fb..08c3fecbb99d3f77801697fd87235ff5d4d3d596 100644
(file)
--- a/
source3/utils/smbcacls.c
+++ b/
source3/utils/smbcacls.c
@@
-266,12
+266,12
@@
static BOOL parse_ace(SEC_ACE *ace, char *str)
/* Only numeric form accepted for flags at present */
/* Only numeric form accepted for flags at present */
- if (!(next_token(
NULL
, tok, "/", sizeof(fstring)) &&
+ if (!(next_token(
&p
, tok, "/", sizeof(fstring)) &&
sscanf(tok, "%i", &aflags))) {
return False;
}
sscanf(tok, "%i", &aflags))) {
return False;
}
- if (!next_token(
NULL
, tok, "/", sizeof(fstring))) {
+ if (!next_token(
&p
, tok, "/", sizeof(fstring))) {
return False;
}
return False;
}
@@
-340,7
+340,7
@@
static SEC_DESC *sec_desc_parse(char *str)
char *p = str;
fstring tok;
SEC_DESC *ret;
char *p = str;
fstring tok;
SEC_DESC *ret;
-
unsigned
sd_size;
+
size_t
sd_size;
DOM_SID *grp_sid=NULL, *owner_sid=NULL;
SEC_ACL *dacl=NULL;
int revision=1;
DOM_SID *grp_sid=NULL, *owner_sid=NULL;
SEC_ACL *dacl=NULL;
int revision=1;