[SCM] Samba Shared Repository - branch master updated - 215b84903ed202e69241d9fd9494fdc95e911efc

Jelmer Vernooij jelmer at samba.org
Thu Oct 23 19:03:15 GMT 2008


The branch, master has been updated
       via  215b84903ed202e69241d9fd9494fdc95e911efc (commit)
       via  09065795d6e5c48a8b3b536224552f18d68cfb84 (commit)
      from  7577d9ebf06fcdb630b2cdaab8772a6da9e37b70 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 215b84903ed202e69241d9fd9494fdc95e911efc
Merge: 09065795d6e5c48a8b3b536224552f18d68cfb84 7577d9ebf06fcdb630b2cdaab8772a6da9e37b70
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Oct 23 20:50:59 2008 +0200

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

commit 09065795d6e5c48a8b3b536224552f18d68cfb84
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Oct 23 18:13:25 2008 +0200

    Remove unused constants from local.h.

-----------------------------------------------------------------------

Summary of changes:
 source4/client/client.c  |    2 +-
 source4/include/local.h  |   13 ++-----------
 source4/param/loadparm.c |    3 ++-
 3 files changed, 5 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/client/client.c b/source4/client/client.c
index 3213c89..1865d8d 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 efffacd..5036f54 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 e626cdf..0c29de6 100644
--- 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");
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list