summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-10-23 21:59:15 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-10-23 21:59:15 +0200
commitf18296151d1d8774b861ef6bd751b48ef9ee2f92 (patch)
tree611553ae425f963afeaa4ba7b028bbce7415d1a6 /source4
parent9d2d66610947a78c33616b7df7e9bf0c224b73e6 (diff)
parent0b68762af7055bb3f60e28ab543dcad2736028e9 (diff)
downloadsamba-f18296151d1d8774b861ef6bd751b48ef9ee2f92.tar.gz
samba-f18296151d1d8774b861ef6bd751b48ef9ee2f92.tar.bz2
samba-f18296151d1d8774b861ef6bd751b48ef9ee2f92.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source4')
-rw-r--r--source4/client/client.c2
-rw-r--r--source4/include/local.h13
-rw-r--r--source4/param/loadparm.c3
3 files changed, 5 insertions, 13 deletions
diff --git a/source4/client/client.c b/source4/client/client.c
index 3213c8931f..1865d8db13 100644
--- a/source4/client/client.c
+++ b/source4/client/client.c
@@ -934,7 +934,7 @@ static int cmd_more(struct smbclient_context *ctx, const char **args)
pager=getenv("PAGER");
- pager_cmd = talloc_asprintf(ctx, "%s %s",(pager? pager:PAGER), lname);
+ pager_cmd = talloc_asprintf(ctx, "%s %s",(pager? pager:DEFAULT_PAGER), lname);
system(pager_cmd);
unlink(lname);
diff --git a/source4/include/local.h b/source4/include/local.h
index efffacd3f5..5036f54802 100644
--- a/source4/include/local.h
+++ b/source4/include/local.h
@@ -34,19 +34,10 @@
/* separators for lists */
#define LIST_SEP " \t,\n\r"
-/* what default type of filesystem do we want this to show up as in a
- NT file manager window? */
-#define FSTYPE_STRING "NTFS"
-
-/* user to test password server with as invalid in security=server mode. */
-#ifndef INVALID_USER_PREFIX
-#define INVALID_USER_PREFIX "sambatest"
-#endif
-
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
-#ifndef PAGER
-#define PAGER "more"
+#ifndef DEFAULT_PAGER
+#define DEFAULT_PAGER "more"
#endif
/*
diff --git a/source4/param/loadparm.c b/source4/param/loadparm.c
index 739994cb8e..2808cb9f28 100644
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2290,7 +2290,8 @@ struct loadparm_context *loadparm_init(TALLOC_CTX *mem_ctx)
SAFE_FREE(myname);
lp_do_global_parameter(lp_ctx, "name resolve order", "wins host bcast");
- lp_do_global_parameter(lp_ctx, "fstype", FSTYPE_STRING);
+ lp_do_global_parameter(lp_ctx, "fstype", "NTFS");
+
lp_do_global_parameter(lp_ctx, "ntvfs handler", "unixuid default");
lp_do_global_parameter(lp_ctx, "max connections", "-1");