sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-17 02:05:21 +03:00
Code

Merge commit 'origin/v3-2-test' into branches/upstream

Browse Source 
(This used to be commit d0bf0ad2ae9a2bff4cec8c7e801a22c624b874ae)
This commit is contained in:
Günther Deschner 2007-11-05 03:39:18 +01:00
commit a7be4d50d4
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/lib/util_str.c
View File

@ -411,13 +411,8 @@ char *strupper_static(const char *s)
{
static char *str = NULL;
if (str) {
SAFE_FREE(str);
}
SAFE_FREE(str);
str = SMB_STRDUP(s);
if (!str) {
return CONST_DISCARD(char *,s);
}
strupper_m(str);
return str;
}

2
source3/smbd/trans2.c
View File

@ -144,7 +144,7 @@ static bool get_ea_value(TALLOC_CTX *mem_ctx, connection_struct *conn, files_str
return False;
}
DEBUG(10,("get_ea_value: EA %s is of length %u: ", ea_name, (unsigned int)sizeret));
DEBUG(10,("get_ea_value: EA %s is of length %u\n", ea_name, (unsigned int)sizeret));
dump_data(10, (uint8 *)val, sizeret);
pea->flags = 0;