summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/lib/util_str.c7
-rw-r--r--source3/smbd/trans2.c2
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;