svn commit: samba r6371 - in branches/SAMBA_3_0_RELEASE/source/smbd: .

[jerry at samba.org]

Author: jerry
Date: 2005-04-18 16:55:49 +0000 (Mon, 18 Apr 2005)
New Revision: 6371

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=6371

Log:
fix botched merge of conflicte file
Modified:
   branches/SAMBA_3_0_RELEASE/source/smbd/msdfs.c


Changeset:
Modified: branches/SAMBA_3_0_RELEASE/source/smbd/msdfs.c
===================================================================
--- branches/SAMBA_3_0_RELEASE/source/smbd/msdfs.c	2005-04-18 16:16:16 UTC (rev 6370)
+++ branches/SAMBA_3_0_RELEASE/source/smbd/msdfs.c	2005-04-18 16:55:49 UTC (rev 6371)
@@ -282,12 +282,7 @@
 *****************************************************************/
 
 static BOOL resolve_dfs_path(pstring dfspath, struct dfs_path* dp, 
-<<<<<<< .mine
-		      connection_struct* conn,
-		      BOOL findfirst_flag, 
-=======
 		      connection_struct* conn, BOOL search_flag, 
->>>>>>> .r6366
 		      struct referral** reflistpp, int* refcntp,
 		      BOOL* self_referralp, int* consumedcntp)
 {
@@ -398,11 +393,7 @@
 	if (!strequal(dp.servicename, lp_servicename(SNUM(conn)) )) 
 		return False;
 
-<<<<<<< .mine
-	if (resolve_dfs_path(pathname, &dp, conn, findfirst_flag, 
-=======
 	if (resolve_dfs_path(pathname, &dp, conn, search_wcard_flag,
->>>>>>> .r6366
 			     NULL, NULL, NULL, NULL)) {
 		DEBUG(3,("dfs_redirect: Redirecting %s\n", pathname));
 		return True;