mirror of
https://github.com/samba-team/samba.git
synced 2025-08-05 12:22:11 +03:00
Updates from Samba HEAD:
- Fix segfaults in the 'net ads' commands when no password is provided
- Readd --with-ldapsam for 2.2 compatability. This conditionally compiles the
old options, but the actual code is available on all ldap systems.
- Fix shadow passwords (as per work with vl)
- Fix sending plaintext passwords to unicode servers (again vl)
- Add a bit of const to secrets.c functions
- Fix some spelling and grammer by vance.
- Document the -r option in smbgroupedit.
There are more changes in HEAD, I'm only merging the changes I've been involved
with.
Andrew Bartlett
(This used to be commit 83973c3893
)
This commit is contained in:
@ -643,8 +643,8 @@ void string_free(char **s)
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
set a string value, allocing the space for the string, and deallocating any
|
||||
existing space
|
||||
set a string value, deallocating any existing space, and allocing the space
|
||||
for the string
|
||||
****************************************************************************/
|
||||
BOOL string_set(char **dest,const char *src)
|
||||
{
|
||||
@ -724,7 +724,7 @@ void pstring_sub(char *s,const char *pattern,const char *insert)
|
||||
|
||||
/* similar to string_sub, but it will accept only allocated strings
|
||||
* and may realloc them so pay attention at what you pass on no
|
||||
* pointers inside strings, no pstrings or const must be passed
|
||||
* pointers inside strings, no pstrings or const may be passed
|
||||
* as string.
|
||||
*/
|
||||
|
||||
@ -830,7 +830,7 @@ void all_string_sub(char *s,const char *pattern,const char *insert, size_t len)
|
||||
|
||||
/****************************************************************************
|
||||
similar to all_string_sub but for unicode strings.
|
||||
return a new allocate unicode string.
|
||||
return a new allocated unicode string.
|
||||
similar to string_sub() but allows for any character to be substituted.
|
||||
Use with caution!
|
||||
****************************************************************************/
|
||||
@ -1203,7 +1203,7 @@ BOOL str_list_copy(char ***dest, char **src)
|
||||
lsize += S_LIST_ABS;
|
||||
rlist = (char **)Realloc(list, ((sizeof(char **)) * (lsize +1)));
|
||||
if (!rlist) {
|
||||
DEBUG(0,("str_list_copy: Unable to allocate memory"));
|
||||
DEBUG(0,("str_list_copy: Unable to re-allocate memory"));
|
||||
str_list_free(&list);
|
||||
return False;
|
||||
}
|
||||
@ -1225,7 +1225,7 @@ BOOL str_list_copy(char ***dest, char **src)
|
||||
return True;
|
||||
}
|
||||
|
||||
/* return true if all the elemnts of the list matches exactly */
|
||||
/* return true if all the elements of the list match exactly */
|
||||
|
||||
BOOL str_list_compare(char **list1, char **list2)
|
||||
{
|
||||
|
Reference in New Issue
Block a user