diff options
| -rw-r--r-- | libcli/util/error.h | 7 | ||||
| -rw-r--r-- | librpc/ndr/libndr.h | 5 | ||||
| -rw-r--r-- | source3/include/proto.h | 1 | ||||
| -rw-r--r-- | source4/client/client.c | 2 | ||||
| -rw-r--r-- | source4/include/local.h | 13 | ||||
| -rw-r--r-- | source4/param/loadparm.c | 3 |
6 files changed, 10 insertions, 21 deletions
diff --git a/libcli/util/error.h b/libcli/util/error.h index 84255448a0..5a7cc1b0b9 100644 --- a/libcli/util/error.h +++ b/libcli/util/error.h @@ -46,11 +46,4 @@ WERROR ntstatus_to_werror(NTSTATUS error); *********************************************************************/ NTSTATUS map_nt_error_from_unix(int unix_error); -enum ndr_err_code; - -/********************************************************************* - Map an NT error code from a NDR error code. -*********************************************************************/ -NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err); - #endif /* _SAMBA_ERROR_H */ diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h index bedf41e965..05455da084 100644 --- a/librpc/ndr/libndr.h +++ b/librpc/ndr/libndr.h @@ -337,6 +337,11 @@ struct ndr_interface_list { const struct ndr_interface_table *table; }; +/********************************************************************* + Map an NT error code from a NDR error code. +*********************************************************************/ +NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err); + /* FIXME: Use represent_as instead */ struct dom_sid; enum ndr_err_code ndr_push_dom_sid2(struct ndr_push *ndr, int ndr_flags, const struct dom_sid *sid); diff --git a/source3/include/proto.h b/source3/include/proto.h index 61f864d3eb..7a5cd3b07e 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -2418,7 +2418,6 @@ ADS_STATUS gp_get_machine_token(ADS_STRUCT *ads, /* The following definitions come from librpc/ndr/util.c */ -NTSTATUS ndr_map_error2ntstatus(enum ndr_err_code ndr_err); enum ndr_err_code ndr_push_server_id(struct ndr_push *ndr, int ndr_flags, const struct server_id *r); enum ndr_err_code ndr_pull_server_id(struct ndr_pull *ndr, int ndr_flags, struct server_id *r); void ndr_print_server_id(struct ndr_print *ndr, const char *name, const struct server_id *r); 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"); |