summaryrefslogtreecommitdiff
path: root/source3/lib/util_str.c
AgeCommit message (Collapse)AuthorFilesLines
2007-10-10r13975: Re-fix Coverity #156 - I had left the hidden arg. inconsistentJeremy Allison1-1/+2
between Realloc and realloc_array. Jeremy. (This used to be commit 841c9b1847ae12656b827e3d35b8bf0c3f68b8b4)
2007-10-10r13915: Fixed a very interesting class of realloc() bugs found by Coverity.Jeremy Allison1-15/+19
realloc can return NULL in one of two cases - (1) the realloc failed, (2) realloc succeeded but the new size requested was zero, in which case this is identical to a free() call. The error paths dealing with these two cases should be different, but mostly weren't. Secondly the standard idiom for dealing with realloc when you know the new size is non-zero is the following : tmp = realloc(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } However, there were *many* *many* places in Samba where we were using the old (broken) idiom of : p = realloc(p, size) if (!p) { return error; } which will leak the memory pointed to by p on realloc fail. This commit (hopefully) fixes all these cases by moving to a standard idiom of : p = SMB_REALLOC(p, size) if (!p) { return error; } Where if the realloc returns null due to the realloc failing or size == 0 we *guarentee* that the storage pointed to by p has been freed. This allows me to remove a lot of code that was dealing with the standard (more verbose) method that required a tmp pointer. This is almost always what you want. When a realloc fails you never usually want the old memory, you want to free it and get into your error processing asap. For the 11 remaining cases where we really do need to keep the old pointer I have invented the new macro SMB_REALLOC_KEEP_OLD_ON_ERROR, which can be used as follows : tmp = SMB_REALLOC_KEEP_OLD_ON_ERROR(p, size); if (!tmp) { SAFE_FREE(p); return error; } else { p = tmp; } SMB_REALLOC_KEEP_OLD_ON_ERROR guarentees never to free the pointer p, even on size == 0 or realloc fail. All this is done by a hidden extra argument to Realloc(), BOOL free_old_on_error which is set appropriately by the SMB_REALLOC and SMB_REALLOC_KEEP_OLD_ON_ERROR macros (and their array counterparts). It remains to be seen what this will do to our Coverity bug count :-). Jeremy. (This used to be commit 1d710d06a214f3f1740e80e0bffd6aab44aac2b0)
2007-10-10r13622: Allow to rename machine accounts in a Samba Domain. This still uses theGünther Deschner1-3/+8
"rename user script" to do the rename of the posix machine account (this might be changed later). Fixes #2331. Guenther (This used to be commit b2eac2e6eb6ddd1bcb4ed5172e7cd64144c18d16)
2007-10-10r13571: Replace all calls to talloc_free() with thye TALLOC_FREE()Gerald Carter1-5/+5
macro which sets the freed pointer to NULL. (This used to be commit b65be8874a2efe5a4b167448960a4fcf6bd995e2)
2007-10-10r13393: Do not initialize the lp_svcctl_list() value since it is handledGerald Carter1-0/+3
internally in services_db.c now. This prevents internal services from being listed twice (one internal and one external) when no 'svcctl list' parameter is explcitly set in smb.conf (This used to be commit 6c4ede6cee7e1d25a6357e959972e8d390c27fe3)
2007-10-10r13316: Let the carnage begin....Gerald Carter1-12/+87
Sync with trunk as off r13315 (This used to be commit 17e63ac4ed8325c0d44fe62b2442449f3298559f)
2007-10-10r12522: Try and fix bug #2926 by removing setlocale(LC_ALL, "C")Jeremy Allison1-8/+8
and replace calls to isupper/islower/toupper/tolower with ASCII equivalents (mapping into _w variants). Jeremy. (This used to be commit c2752347eb2deeb2798c580ec7fc751a847717e9)
2007-10-10r12313: Introduce yet another copy of the string_sub function:Volker Lendecke1-1/+73
talloc_string_sub. Someone with time on his hands could convert all the callers of all_string_sub to this. realloc_string_sub is *only* called from within substitute.c, it could be moved there I think. Volker (This used to be commit be6c9012da174d5d5116e5172a53bbe6486d6c38)
2007-10-10r9282: Whitespace.Jeremy Allison1-10/+10
Jeremy. (This used to be commit 183a4705114da7c3662b71405457123ce35b5358)
2007-10-10r9271: Fix problems with german umlauts - strcmp_w was broken (needs to ↵Jeremy Allison1-5/+5
always re-call macro on termination). Fix all other cases where this was also occurring. Jeremy. (This used to be commit 816e2fbb39b544b7f62d5351f3a8e0af63717227)
2007-10-10r9201: Ouch.... :-(Volker Lendecke1-1/+1
(This used to be commit c78760d71ec6a364a912ba35e8a90f8005fdc018)
2007-10-10r9198: Convert hex_encode and strhex_to_data_blob to take a talloc context.Volker Lendecke1-5/+11
Volker (This used to be commit c7d10e2c834d8d5136e2d01dea1ad286757deddb)
2007-10-10r8686: Revert %LOGONSERVER%-substitution. The substition is done on the client,Günther Deschner1-3/+12
not on the server. We now preserve this windows variable (important for vampired setups) and correctly substitute only the "%L"s in strings like: "%LOGONSERVER% %L %lOgOnSeRvEr% %L". Guenther (This used to be commit dccf777f42ce1d3f788548842fb8a606bed5708c)
2007-10-10r8506: BUG 2853: don't strip out characters like '$' from printer namesGerald Carter1-3/+12
when substituting for the lpq command. (This used to be commit 2f5de718a98e56fe55d8905b12505dfc3e432544)
2007-10-10r8189: commit vampire ldif patch, mostly from Don Watson ↵Jim McDonough1-0/+27
(dwatson@us.ibm.com). Yes, that's my copyright...that's just how we have to do things at big blue. Adds subcommand to vampire to allow data to be put into an ldif file instead of actually writing to the passdb. See "net rpc help vampire" for usage info. This should be added to docs as well. (This used to be commit cb5634a305256a70daa2fcbd85d9a5459b4aeaa3)
2007-10-10r7415: * big change -- volker's new async winbindd from trunkGerald Carter1-0/+66
(This used to be commit a0ac9a8ffd4af31a0ebc423b4acbb2f043d865b8)
2007-10-10r7139: trying to reduce the number of diffs between trunk and 3.0; changing ↵Gerald Carter1-11/+11
version to 3.0.20pre1 (This used to be commit 9727d05241574042dd3aa8844ae5c701d22e2da1)
2007-10-10r6149: Fixes bugs #2498 and 2484.Derrell Lipman1-11/+11
1. using smbc_getxattr() et al, one may now request all access control entities in the ACL without getting all other NT attributes. 2. added the ability to exclude specified attributes from the result set provided by smbc_getxattr() et al, when requesting all attributes, all NT attributes, or all DOS attributes. 3. eliminated all compiler warnings, including when --enable-developer compiler flags are in use. removed -Wcast-qual flag from list, as that is specifically to force warnings in the case of casting away qualifiers. Note: In the process of eliminating compiler warnings, a few nasties were discovered. In the file libads/sasl.c, PRIVATE kerberos interfaces are being used; and in libsmb/clikrb5.c, both PRIAVE and DEPRECATED kerberos interfaces are being used. Someone who knows kerberos should look at these and determine if there is an alternate method of accomplishing the task. (This used to be commit 994694f7f26da5099f071e1381271a70407f33bb)
2007-10-10r6014: rather large change set....Gerald Carter1-0/+14
pulling back all recent rpc changes from trunk into 3.0. I've tested a compile and so don't think I've missed any files. But if so, just mail me and I'll clean backup in a couple of hours. Changes include \winreg, \eventlog, \svcctl, and general parse_misc.c updates. I am planning on bracketing the event code with an #ifdef ENABLE_EVENTLOG until I finish merging Marcin's changes (very soon). (This used to be commit 4e0ac63c36527cd8c52ef720cae17e84f67e7221)
2007-10-10r5961: final round of compiler warning fixes based on feedback from Jason MaderGerald Carter1-1/+1
(This used to be commit 9e77da9320c900b3e437d534e31fa5ff81e9acfd)
2007-10-10r5956: more compile warngin fixes from the Mr. MaderGerald Carter1-3/+3
(This used to be commit f3f315b14d261fa56ab040db036a6f858ac06e65)
2007-10-10r5954: Fix some compiler warnings and add missing exclude-block in "net rpcGünther Deschner1-1/+1
share migrate" (found by Lars Mueller <lmuelle@suse.de>). Guenther (This used to be commit 45a2a7bedb877745cd9677fe3124d5a2ad2c8853)
2007-10-10r5953: more compiler cleanups; moved SID_LIST from smb.h to privileges.c to ↵Gerald Carter1-1/+1
cleanup the name space (This used to be commit 7dfafa712deb115e425c7367296400c54827a217)
2007-10-10r5158: BUG 2263: patch from Timur Bakeyev <timur@com.bat.ru> to guard ↵Gerald Carter1-4/+10
base64_encode_data_blob() against empty blobs (This used to be commit 17239d609f63ae5bd6826e580876c27e8c92d6fa)
2007-10-10r5066: A couple of small fixes from James Peach @ SGI.Jeremy Allison1-2/+2
Jeremy. (This used to be commit 9d131e94195df79e07c8fad20e12ba1b67441a81)
2007-10-10r4746: add server support for lsa_enum_acct_rights(); last checkin for the nightGerald Carter1-0/+16
(This used to be commit ccdff4a998405544433aa32938963e4c37962fcc)
2007-10-10r4334: Fix for bugid #2186 - from Buck Huppmann <buckh@pobox.com>Jeremy Allison1-0/+8
to prevent uninitialized creds being freed. Jeremy. (This used to be commit c3f9c81a8fcb26f7110f75b3096d5d1eb30aac13)
2007-10-10r4088: Get medieval on our ass about malloc.... :-). Take control of all our ↵Jeremy Allison1-19/+19
allocation functions so we can funnel through some well known functions. Should help greatly with malloc checking. HEAD patch to follow. Jeremy. (This used to be commit 620f2e608f70ba92f032720c031283d295c5c06a)
2007-10-10r2605: Fix stupid typo in back-port of Samba4 fix.Jeremy Allison1-1/+1
Jeremy. (This used to be commit ca9516520ffe007a7dccd4d6cbf1c5d77fc4ce29)
2007-10-10r2578: Pick up optimisation from Samba4 - thanks tridge !Jeremy Allison1-0/+12
- I recently found out that charaters below 0x3F are guaranteed not to occur as secondary bytes in any multi-byte character set. This allows for a very simple optimisation in strchr_m() and strrchr_m(). It might be a good idea to pick this up for Samba3. Jeremy. (This used to be commit 0465e2d23d27e535bad4652037b37041049bfa96)
2007-10-10r2361: Fix the appalling toktocliplist() fn. Bug found by Luis Benvenutto.Jeremy Allison1-5/+8
Jeremy. (This used to be commit d434d8e2b47bc8553ee04bd7211f622e3fcbb7fb)
2007-10-10r2175: Fix for #1546 from fumiya@samba.gr.jp. Preserve errno in MB ↵Jeremy Allison1-0/+6
strupper_m/strlower_m. Jeremy. (This used to be commit 615aa6e914e6bc3691156a3b80244fc98d8ecc56)
2007-10-10r2111: Fix memleak with valid names.Jeremy Allison1-0/+1
Jeremy. (This used to be commit 3f0707132afc66109701766528cb0bd1e1c7cd8c)
2007-10-10r2070: Let's try to overload srnlen and strndup for AIX where they are natly ↵Simo Sorce1-2/+2
broken. (This used to be commit 98feb3318f54bb48ce56fc8f4721fec4967b9dd9)
2007-10-10r1570: merging changes from 3.0.5Gerald Carter1-4/+12
(This used to be commit 430cf63b9148441bce42bfb15a8045de5da108f4)
2007-10-10r1087: BUG 1221: revert old change that used single and double quotes as ↵Gerald Carter1-1/+1
delimters in next_token(), and change print_parameter() to print out parm values surrounded by double quotes (instead of single quotes) (This used to be commit b0739b073a1db8b0b163726a1d181b2f05d71883)
2007-10-10r570: Remove lots of globals to handle case issues - move themJeremy Allison1-4/+2
to connection struct entries (as they should have been from the start). Jerry, once you've cut over to 3.0.4 release branch I'll add this to 3.0 also. - Jerry cut over :-). Jeremy. (This used to be commit 578a508509d21226ad3332fc54c3ab54cd8ae452)
2007-10-10r116: volker's patch for local group and group nestingGerald Carter1-0/+18
(This used to be commit b393469d9581f20e4d4c52633b952ee984cca36f)
2007-10-10r104: Fix ntlm_auth by adding the new strhex_to_data_blob() call.Andrew Bartlett1-0/+11
Andrew Bartlett (This used to be commit 0693b9e79fabd58491f8aaec11dbbc71fab34f80)
2004-03-13Modified fix for bugid #784. Based on a patch from moriyama@miraclelinux.com ↵Jeremy Allison1-1/+0
(MORIYAMA Masayuki). Don't use nstrings to hold workgroup and netbios names. The problem with them is that MB netbios and workgroup names in unix charset (particularly utf8) may be up to 3x bigger than the name when represented in dos charset (ie. cp932). So go back to using fstrings for these but translate into nstrings (ie. 16 byte length values) for transport on the wire. Jeremy. (This used to be commit b4ea493599ab414f7828b83f40a5a8b43479ff64)
2004-03-09Given how core this code is, I figure it should have it's own testsuite.Andrew Bartlett1-7/+11
Big thanks to tpot and mbp for showing how easy it can be to write a simple unit test, and for providing the STF. This also changes the strstr_m() code to use strstr_w() (avoiding duplication) and fixes it so that it passes the STF. (We now always restart before doing the unicode run, until sombody can show me why the testsuite is wrong). Andrew Bartlett (This used to be commit a893a324f37e6a171719db8ffffe66df31c2dbaa)
2004-03-09JRA's recent strstr_m work really badly broke our string_sub code.Andrew Bartlett1-2/+10
For example: strstr_m("%v foo bar", "%v") would fail... only strstr_m("foo %v", "%v") could work. I wonder what else this broke... Fix is to move to using strncmp() inside the strstr_m function. Tested on ASCII only. Andrew Bartlett (This used to be commit 44d304f84c4ba5a832d5e3848ae0d04d5438ac15)
2004-03-09Added strstr_m() function. Use in all places where we might run into mbJeremy Allison1-4/+74
(should fix the mb service name problem, can't remember the bugid). Jeremy. (This used to be commit 94a272b9a881ec0004c5da2a7242b0a818da5630)
2004-02-13Missed SAFE_FREE (typo).Jeremy Allison1-1/+2
Jeremy. (This used to be commit ac1d03c05bf6247541fbd6f0c3bd5b2e5b6a5212)
2004-02-13Added Andrew Bartlett's patch to use an allocated buffer for count_chars.Jeremy Allison1-2/+8
Jeremy. (This used to be commit cdbeb7d2ebcd4a298aabb3ed665560d219bb0d1c)
2004-02-04Fix final valgrind errors with #830. Catch mb conversion error that may notJeremy Allison1-2/+16
terminate correctly. Jeremy. (This used to be commit 49142c6352eb3645437ef86bcedca1b1895aef60)
2004-01-23Fix decoding of base64. We got the length wrong when the result was notVolker Lendecke1-0/+2
an exact multiple of 3. I also wrote a torture test and it survived some minutes of random stuff coded/decoded up to 16 MB data. But that would be a bit too embarassing to commit... :-) Volker (This used to be commit 6d22f0d8c36bea618ad0adf4eefc2f5a37cb3fda)
2004-01-07Fix for bug #922. Fast path not called for strlower_m() and strupper_m().Jeremy Allison1-2/+2
From ab@samba.org (Alexander Bokovoy). Jeremy. (This used to be commit fac9e6d7125fb9edfade3c92a3cd9e1f2c60cefd)
2003-12-25Fix bug 916 - do not perform a + -> space substitution for squid URL encodedAndrew Bartlett1-5/+0
strings, only form input in SWAT. Andrew Bartlett (This used to be commit 8d54f5fe0c5689660f37788916b37014754ce23e)
2003-11-22Ensure that items in a list of strings containing whitespaceGerald Carter1-1/+1
are written out surrounded by single quotes. This means that both double and single quotes are now used to surround strings in smb.conf. This is a slight change from the previous behavior but needed or else things like printer admin = +ntadmin, 'VALE\Domain, Admin' get written to smb.conf by SWAT. (This used to be commit 5bf91c79d620e34ac71d72c80f74e47754d49dcb)