summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/smbd/filename.c11
-rw-r--r--source3/smbd/service.c4
2 files changed, 2 insertions, 13 deletions
diff --git a/source3/smbd/filename.c b/source3/smbd/filename.c
index 70f34c52ad..17fa35c0d7 100644
--- a/source3/smbd/filename.c
+++ b/source3/smbd/filename.c
@@ -125,10 +125,6 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component,
pstring orig_path;
BOOL component_was_mangled = False;
BOOL name_has_wildcard = False;
-#if 0
- /* Andrew's conservative code... JRA. */
- extern char magic_char;
-#endif
ZERO_STRUCTP(pst);
@@ -240,13 +236,6 @@ BOOL unix_convert(char *name,connection_struct *conn,char *saved_last_component,
if(is_mangled(start))
component_was_mangled = True;
-#if 0
- /* Keep Andrew's conservative code around, just in case. JRA. */
- /* this is an extremely conservative test for mangled names. */
- if (strchr_m(start,magic_char))
- component_was_mangled = True;
-#endif
-
/*
* Now we need to recursively match the name against the real
* directory structure.
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index b65ac13e74..6f29088a97 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -344,7 +344,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int
if (user_in_list(user, list))
conn->read_only = True;
}
- else DEBUG(0, ("read list substitution failed readlist: 0x%x list: 0x%x\n", lp_readlist(snum), list));
+ else DEBUG(0, ("read list substitution failed\n"));
if (list) lp_list_free(&list);
lp_list_copy(&list, lp_writelist(snum));
@@ -352,7 +352,7 @@ connection_struct *make_connection(char *service,char *user,char *password, int
if (user_in_list(user, list))
conn->read_only = False;
}
- else DEBUG(0, ("write list substitution failed writelist: 0x%x list: 0x%x\n", lp_writelist(snum), list));
+ else DEBUG(0, ("write list substitution failed writelist\n"));
if (list) lp_list_free(&list);
}