diff options
| author | Gerald Carter <jerry@samba.org> | 2002-05-24 16:27:54 +0000 |
|---|---|---|
| committer | Gerald Carter <jerry@samba.org> | 2002-05-24 16:27:54 +0000 |
| commit | 5b76d846f87fa138e64e0526925bad5a4a51a263 (patch) | |
| tree | 42e5bb94d7d81047a6b8ab4a2bde8e559200def9 /source3/rpc_parse/parse_sec.c | |
| parent | 7ff439756685a8a0b69b25f58e866e03ba0e8699 (diff) | |
| download | samba-5b76d846f87fa138e64e0526925bad5a4a51a263.tar.gz samba-5b76d846f87fa138e64e0526925bad5a4a51a263.tar.bz2 samba-5b76d846f87fa138e64e0526925bad5a4a51a263.zip | |
merge from SAMBA_2_2.
Tim, please check the prs_align() removed from sec_io_desc()
and make sure it doesn't break anything else. I know it is
right for the printing needs and I have tested some other
general things like viewing acls on directories, but I would
feel more comfortable if you would have a look as well.
jerry
(This used to be commit 83f109c940f30d9b35176540d8bdccbb22ffa3a1)
Diffstat (limited to 'source3/rpc_parse/parse_sec.c')
| -rw-r--r-- | source3/rpc_parse/parse_sec.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/rpc_parse/parse_sec.c b/source3/rpc_parse/parse_sec.c index c501f90479..a8c956a209 100644 --- a/source3/rpc_parse/parse_sec.c +++ b/source3/rpc_parse/parse_sec.c @@ -749,8 +749,15 @@ BOOL sec_io_desc(char *desc, SEC_DESC **ppsd, prs_struct *ps, int depth) prs_debug(ps, depth, desc, "sec_io_desc"); depth++; +#if 0 /* JERRY */ + /* + * if alignment is needed, should be done by the the + * caller. Not here. This caused me problems when marshalling + * printer info into a buffer. --jerry + */ if(!prs_align(ps)) return False; +#endif /* start of security descriptor stored for back-calc offset purposes */ old_offset = prs_offset(ps); |