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

5 files changed, 7 insertions, 29 deletions

diff --git a/source3/include/ntdomain.h b/source3/include/ntdomain.h
index f90478296c..bbe653b8bd 100644
--- a/source3/include/ntdomain.h
+++ b/source3/include/ntdomain.h
@@ -241,15 +241,4 @@ struct api_struct {
 	bool (*fn) (pipes_struct *);
 };
 
-/*
- * higher order functions for use with msrpc client code
- */
-
-#define PRINT_INFO_FN(fn)\
-        void (*fn)(const char*, uint32, uint32, void  *const *const)
-#define JOB_INFO_FN(fn)\
-        void (*fn)(const char*, const char*, uint32, uint32, void *const *const)
-
-/* end higher order functions */
-
 #endif /* _NT_DOMAIN_H */
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c
index c197fd7515..9a0b12adea 100644
--- a/source3/lib/util_str.c
+++ b/source3/lib/util_str.c
@@ -1616,7 +1616,7 @@ bool str_list_sub_basic( char **list, const char *smb_name,
 }
 
 /******************************************************************************
- substritute a specific pattern in a string list
+ substitute a specific pattern in a string list
  *****************************************************************************/
 
 bool str_list_substitute(char **list, const char *pattern, const char *insert)
@@ -2430,13 +2430,13 @@ char *escape_shell_string(const char *src)
 
 #define S_LIST_ABS 16 /* List Allocation Block Size */
 
-char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string, const char *sep)
+char **str_list_make_v3(TALLOC_CTX *mem_ctx, const char *string,
+	const char *sep)
 {
 	char **list;
 	const char *str;
-	char *s;
+	char *s, *tok;
 	int num, lsize;
-	char *tok;
 
 	if (!string || !*string)
 		return NULL;
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 408721ab3e..c92bc8ec21 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -652,7 +652,8 @@ static int vfswrap_lstat(vfs_handle_struct *handle,
 }
 
 static NTSTATUS vfswrap_translate_name(vfs_handle_struct *handle,
-				       char **mapped_name)
+				       char **mapped_name,
+				       enum vfs_translate_direction direction)
 {
 	/* Default behavior is a NOOP */
 
diff --git a/source3/nmbd/nmbd_packets.c b/source3/nmbd/nmbd_packets.c
index 4045184f33..6136c6d171 100644
--- a/source3/nmbd/nmbd_packets.c
+++ b/source3/nmbd/nmbd_packets.c
@@ -1068,7 +1068,7 @@ mismatch with our scope (%s).\n", inet_ntoa(p->ip), scope, global_scope()));
 
 	pull_ascii_nstring(src_name, sizeof(src_name), dgram->source_name.name);
 	if (is_myname(src_name)) {
-		DEBUG(0,("process_browse_packet: Discarding datagram from IP %s. Source name \
+		DEBUG(7,("process_browse_packet: Discarding datagram from IP %s. Source name \
 %s is one of our names !\n", inet_ntoa(p->ip), nmb_namestr(&dgram->source_name)));
 		return;
 	}
diff --git a/source3/winbindd/winbindd_rpc.c b/source3/winbindd/winbindd_rpc.c
index 82e782b9db..ac5c3d2d93 100644
--- a/source3/winbindd/winbindd_rpc.c
+++ b/source3/winbindd/winbindd_rpc.c
@@ -493,18 +493,6 @@ static NTSTATUS query_user(struct winbindd_domain *domain,
 		return NT_STATUS_OK;
 	}
 
-	if ( !winbindd_can_contact_domain( domain ) ) {
-		DEBUG(10,("query_user: No incoming trust for domain %s\n",
-			  domain->name));
-		return NT_STATUS_OK;
-	}
-
-	if ( !winbindd_can_contact_domain( domain ) ) {
-		DEBUG(10,("query_user: No incoming trust for domain %s\n",
-			  domain->name));
-		return NT_STATUS_OK;
-	}
-
 	/* no cache; hit the wire */
 
 	result = cm_connect_sam(domain, mem_ctx, &cli, &dom_pol);