diff options
| author | Günther Deschner <gd@samba.org> | 2007-11-05 03:39:18 +0100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2007-11-05 03:39:18 +0100 |
| commit | a7be4d50d468da3ca7a8852780aeb901019d61c3 (patch) | |
| tree | fc2eb71d33c4a619189641852cb52fb35da7cd0e | |
| parent | e83e0f36846ba2b7831a63cb8717432617b337fd (diff) | |
| parent | 2d73e86ccef0ba66309ce764ebe9df0deb076bb8 (diff) | |
| download | samba-a7be4d50d468da3ca7a8852780aeb901019d61c3.tar.gz samba-a7be4d50d468da3ca7a8852780aeb901019d61c3.tar.bz2 samba-a7be4d50d468da3ca7a8852780aeb901019d61c3.zip | |
Merge commit 'origin/v3-2-test' into branches/upstream
(This used to be commit d0bf0ad2ae9a2bff4cec8c7e801a22c624b874ae)
| -rw-r--r-- | source3/lib/util_str.c | 7 | ||||
| -rw-r--r-- | source3/smbd/trans2.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 1f3aab3bce..6458ae3e05 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -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; } diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index dfd926ace9..3abc0d065c 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -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; |