Merge branch 'master' of git://git.samba.org/samba

diff --git a/source4/client/client.c b/source4/client/client.c
index 3213c8931ff33ac0d1aac88decbe8a1f468b3dc0..1865d8db132b311fa045459a09ec982e565c77a8 100644 (file)
--- 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 efffacd3f55d39b6d03af32742b1f5eb4ec7a111..5036f548029ddb8eab14a32acc768079eb1e4533 100644 (file)
--- 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 e626cdf5ddd91a5616e032d7260cd6f604c8f025..0c29de64c348412bbbeaa67a88f7ee88cbe374b3 100644 (file)
--- a/source4/param/loadparm.c
+++ b/source4/param/loadparm.c
@@ -2295,7 +2295,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");