1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-14 19:24:43 +03:00

190 Commits

Author SHA1 Message Date
Michael Adam
f16ddcae69 s3:lib/charcnv: clarify comments in next_codepoint_ext()
(giving the unicod U+<hexnumber> notation of the codepoints
 referred to in the comments)
2010-11-03 22:45:19 +00:00
Michael Adam
5b6a88b9bf s3:lib/charcnv: rename a parameter for clarity in next_codepoint_ext() 2010-11-03 22:45:19 +00:00
Michael Adam
18104ef1be s3:lib/charcnv: reformat comments in next_codepoint_ext() 2010-11-03 22:45:19 +00:00
Michael Adam
d41d05ec7b s3:lib/charcnv: add next_codepoint_ext() that accepts input charset.
next_codepoint() takes as string in CH_UNIX encoding and returns the
unicode codepoint of the next (possibly multibyte) character of the
input string.

The new next_codepoint_ext() function adds the encoding of the input
string as a parameter. next_codepoint() now only calls next_codepoint_ext()
with CH_UNIX als src_charset argument.
2010-11-03 22:45:19 +00:00
Volker Lendecke
6b167ae53b Use a switch statement in charset_name() 2009-07-25 12:58:06 -04:00
Jeremy Allison
d5c20c072b Replace short-lived NULL talloc contexts with talloc_tos().
Jeremy.
2009-07-16 18:13:46 -07:00
Jeremy Allison
dc5c7b7f98 Make ctemp async. Fix the test to pass against W2K3.
Jeremy.
2009-06-10 11:58:00 -07:00
Günther Deschner
fb6e835543 s3-charcnv: always talloc_free in convert_string_talloc() error path.
Guenther
2009-06-08 10:44:50 +02:00
Günther Deschner
2775c52baa s3-charcnv: remove remaining malloc references in convert_string_talloc().
Guenther
2009-06-08 10:26:40 +02:00
Volker Lendecke
79f33674c6 Fix a malloc/talloc mixup 2009-05-02 12:44:31 +02:00
Günther Deschner
d9805878e2 s3-auth-charcnv: fix push_string(). Don't push to ucs2 and ascii after another.
This fixes all kinds of encrypted passwords used in the shared auth code naturally.
Andrew B., please check.

Guenther
2009-04-27 21:05:40 +02:00
Jelmer Vernooij
598f78bd1f charcnv: Import push_codepoint(). 2009-04-23 17:50:18 +02:00
Andrew Bartlett
baf7274fed Make Samba3 use the new common libcli/auth code
This is particuarly in the netlogon client (but not server at this
stage)
2009-04-14 16:23:44 +10:00
Andrew Bartlett
786447dea0 s3:charcnv remove now unused malloc() based conversion functions 2009-04-14 12:54:13 +10:00
Andrew Bartlett
3b3e21bd9b Convert Samba3 to use the common lib/util/charset API
This removes calls to push_*_allocate() and pull_*_allocate(), as well
as convert_string_allocate, as they are not in the common API

To allow transition to a common charcnv in future, provide Samba4-like
strupper functions in source3/lib/charcnv.c

(the actual implementation remains distinct, but the API is now shared)

Andrew Bartlett
2009-04-14 12:53:56 +10:00
Andrew Bartlett
4786a493f7 Solve some of the conflict between Samba3 and Samba4 push_string
This renames push_string in Samba3 into push_string_base and
push_string_check for the two different use cases.

This should allow push_string to be imported from Samba4, using it's
calling conventions.
2009-04-14 12:11:00 +10:00
Jeremy Allison
1e742660bf Tidy up some convert_string_internal error cases, found by Andrew Bartlett.
Jeremy.
2009-03-31 18:28:49 -07:00
Jelmer Vernooij
f992416e23 Revert accidental reintroduction of void ** bug. 2009-03-08 06:57:52 +01:00
Jelmer Vernooij
7ab8f373c8 Use common header file for character set handling in Samba 3 and Samba 4. 2009-03-01 22:24:34 +01:00
Volker Lendecke
ffb53c3574 Even for srclen == 0 we have to return something
This fixes a regression reported by Corinna Vinschen <corinna@vinschen.de>

Thanks,

Volker
2009-01-12 10:52:00 +01:00
Jeremy Allison
6f77607047 Fix bug 5826 - Directory/Filenames get truncated when 3.2.0 client acesses old server.
There was some code in pull_ucs2_base_talloc() to cope with this case which
hadn't been added to pull_ascii_base_talloc(). The older Samba returns non
unicode names which is why you are seeing this codepath being executed.

Unify the logic in pull_ascii_base_talloc() and pull_ucs2_base_talloc().
Jeremy.
2008-10-16 15:40:57 -07:00
Jeremy Allison
03991ab073 Fix bug 5686 - libsmbclient segfaults with more than one SMBCCTX.
Here is a patch to allow many subsystems to be re-initialized. The only
functional change I made was to remove the null context tracking, as the memory
allocated here is designed to be left for the complete lifetime of the program.
Freeing this early (when all smb contexts are destroyed) could crash other
users of talloc.
Jeremy.
(This used to be commit 8c630efd25cf17aff59448ca05c1b44a41964b16)
2008-08-12 13:35:15 -07:00
Tim Prouty
fb37f15600 Cleanup size_t return values in callers of convert_string_allocate
This patch is the second iteration of an inside-out conversion to cleanup
functions in charcnv.c returning size_t == -1 to indicate failure.
(This used to be commit 6b189dabc562d86dcaa685419d0cb6ea276f100d)
2008-05-20 22:40:13 +02:00
Tim Prouty
bb869741dd Cleanup size_t return values in convert_string_allocate
This patch is the first iteration of an inside-out conversion to cleanup
functions in charcnv.c returning size_t == -1 to indicate failure.
(This used to be commit 59124382d2894a1b194b48dd82bc5f956959eb48)
2008-04-11 11:33:33 +02:00
Michael Adam
1fcbcbb486 charcnv: add talloc_strdup_lower() - talloc variant of strdup_lower().
Michael
(This used to be commit 5f6c730cbeddd1ac2f515bd985c08ceb4ca9bc47)
2008-04-10 01:27:56 +02:00
Jeremy Allison
b9b75f37ac Ensure that convert_string_allocate() allocates 2 extra
bytes and null terminates them to ensure NDR wire-reads
of string types are always null terminated. Bug found by
Volker after great pain :-).
Jeremy.
(This used to be commit aab736e6079729b3f3ab653674834e3f1305d456)
2008-02-01 14:23:54 -08:00
Jeremy Allison
980ac09849 Fixup hot paths - add macro for toupper (c < 0x80).
This now matches 3.0.x on my micro-tests.
Jeremy.
(This used to be commit 329b924cba8225002ca40db26c45b31d141a0925)
2008-01-09 17:32:26 -08:00
Volker Lendecke
2ae400b213 Make init_doschar_table() static
It's only called directly before init_valid_table() anyway, so move it there.
(This used to be commit b6d1d2428866712a550a354732e2386b4f87b67b)
2007-12-16 10:56:58 -08:00
Jeremy Allison
1b92ea5559 Remove pstrings from client/client.c by doing a large rewrite.
Mostly compiles....
Jeremy.
(This used to be commit c87f3eba9aa52f4ab25d77e2167262bf5c43b1a6)
2007-12-06 17:16:33 -08:00
Jeremy Allison
755051b569 pull_ascii_pstring is gone.
Jeremy.
(This used to be commit 288aacce4b56d159218be311019cb951e5a232fd)
2007-12-04 17:05:33 -08:00
Jeremy Allison
5ea101f048 Allow STR_TERMINATE and -1 src_len for pull_ucs2_base_talloc().
Jeremy.
(This used to be commit 063358d87ac9a1d948c8d4b6358e926dd14bb3ac)
2007-12-04 15:21:14 -08:00
Jeremy Allison
c049b8157d More trivial pstring removal.
Jeremy.
(This used to be commit bac3bb2f6e9e15b3a9a6a6511c484f8509918ca1)
2007-11-20 15:31:37 -08:00
Jeremy Allison
cf31bb7532 Start to remove some of the pstring functions we're
no longer using.
Jeremy.
(This used to be commit c21e9bdc1059268adbd14207e74097349676439e)
2007-11-19 17:51:21 -08:00
Jeremy Allison
30191d1a57 RIP BOOL. Convert BOOL -> bool. I found a few interesting
bugs in various places whilst doing this (places that assumed
BOOL == int). I also need to fix the Samba4 pidl generation
(next checkin).
Jeremy.
(This used to be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)
2007-10-18 17:40:25 -07:00
Jeremy Allison
3f2939cc16 r25277: Belt-and-braces approach to Volker's fix for RPC-SAMBA3-GETUSERNAME.
If we promise dest is null terminated, ensure we do it even on
fast path exits.
Jeremy.
(This used to be commit 32626e2b9770eb6b15c191a8feb881f81ed6c57a)
2007-10-10 12:30:57 -05:00
Michael Adam
2bb7ebdcb7 r25258: Fix a panic message and remove superfluous return after the call to smb_panic().
Michael
(This used to be commit 8b5c34b7d141c44d65622f44f9432723230cea47)
2007-10-10 12:30:55 -05:00
Jeremy Allison
934b92f5d0 r25238: Make the error returns from the string functions
always consistent. Return -1 on error, and ensure
we check for this. In cases where the dest is already
specified and we've been asked to terminate with a
null, ensure we always do so even on error.
Jeremy.
(This used to be commit abedd967869ade9a43c3a8e1b889c60d4aca81cf)
2007-10-10 12:30:53 -05:00
Jeremy Allison
3d5f029ead r25222: Fix last assumptions that (size_t)-1 can be used
as a special dest_len of sizeof(pstring).
Jeremy.
(This used to be commit 9fc14c83cc5e3a360464c33e26b1073db63763d7)
2007-10-10 12:30:51 -05:00
Jeremy Allison
38ffbd2893 r25199: Remove pstring from strdup_upper - make it the
same as talloc_strdup_upper.
Jeremy.
(This used to be commit db1b6293771755f20660b071aac0284638dbed46)
2007-10-10 12:30:51 -05:00
Jeremy Allison
4f051e735b r25195: Fix issue with calling pull_uc2_*alloc with
str_len == 0. We should just return 0 in this
case.
Jeremy.
(This used to be commit 8bb85f3f141f0f45b06d28f004cb2cf18252d4e1)
2007-10-10 12:30:50 -05:00
Volker Lendecke
ad97bcf813 r25184: Fix some C++ warnings and an uninitialized variable
(This used to be commit b64df8a3c504ab7749c21ffb26e4771a9a0a328f)
2007-10-10 12:30:49 -05:00
Jeremy Allison
eacd314057 r25138: More pstring elimination. Add a TALLOC_CTX parameter
to unix_convert().
Jeremy.
(This used to be commit 39c211a702e91c34c1a5a689e1b0c4530ea8a1ac)
2007-10-10 12:30:44 -05:00
Jeremy Allison
d0de93ca76 r25136: When tallocing a string to uppercase remember the terminating
'\0' in size calculations.
Jeremy.
(This used to be commit 54c658867db3b6c602080d60936abab3af26e112)
2007-10-10 12:30:43 -05:00
Jeremy Allison
6716382ec9 r25120: One more warning.
Jeremy.
(This used to be commit 9cc70e3ccff9c3b20076572235d9dcbfd23e97e5)
2007-10-10 12:30:42 -05:00
Jeremy Allison
12f61e09d9 r25117: The mega-patch Jerry was waiting for. Remove all pstrings from
the main server code paths. We should now be able to cope with
paths up to PATH_MAX length now.
Final job will be to add the TALLOC_CTX * parameter to
unix_convert to make it explicit (for Volker).
Jeremy.
(This used to be commit 7f0db75fb0f24873577dcb758a2ecee74fdc4297)
2007-10-10 12:30:41 -05:00
Jeremy Allison
3a9d382164 r25111: Move to talloced pathnames on most code paths.
There are now ony 17 pstrings left in reply.c,
and these will be easy to remove (and I'll be
doing that shortly). Had to fix an interesting
bug in pull_ucs2_base_talloc() when a source
string is not null terminated :-).
Jeremy.
(This used to be commit 0c9a8c4dff10974dbffd2a302ae982896122fcc0)
2007-10-10 12:30:41 -05:00
Jeremy Allison
132ee3990a r25009: Large patch discussed with Volker. Move unix_convert to a talloc-based
interface. More development will come on top of this. Remove the
"mangled map" parameter.
Jeremy.
(This used to be commit dee8beba7a92b8a3f68bbcc59fd0a827f68c7736)
2007-10-10 12:30:32 -05:00
Volker Lendecke
b62bd05b93 r24133: Explicitly pass flags2 down to push_string_fn
This needs a bit closer review, it also touches the client libs
(This used to be commit 824eb26738d64af1798d319d339582cf047521f0)
2007-10-10 12:29:10 -05:00
Volker Lendecke
6eca5f5042 r23865: Fix a type-punned error
(This used to be commit a40d3a566af88464fc6afd2c6e6e8b6e3a98aac2)
2007-10-10 12:28:35 -05:00
Jeremy Allison
e8dc2ea03d r23858: Added srvstr_pull_buf_talloc() and srvstr_pull_talloc()
calls and converted reply_tcon and reply_tconX to use
them - to show the boilerplate usage (valgrind tested).
In conjunction with Volker's srvstr_get_path_talloc()
work this should allow us to start eliminating all
pstrings/fstrings out of the main path processing
code.
I'll watch the build farm tonight...
Jeremy.
(This used to be commit b4eff3f68089f082781afcf90d43faa317949566)
2007-10-10 12:28:35 -05:00