From ba3db4795ea258f9defc47fe7eeceb30c080b59a Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Thu, 26 Aug 2004 17:39:48 +0000
Subject: [PATCH] Allow the use of the --exclude*/--include* options to a
 server process again, but make sure that the user didn't specify a
 server-excluded file for one of the --*-from options.

---
 options.c | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/options.c b/options.c
index ec42bf8d..a1c8df55 100644
--- a/options.c
+++ b/options.c
@@ -540,32 +540,28 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
 			break;
 
 		case OPT_EXCLUDE:
-			if (am_server || sanitize_paths)
-				return 0; /* Impossible... */
 			add_exclude(&exclude_list, poptGetOptArg(pc), 0);
 			break;
 
 		case OPT_INCLUDE:
-			if (am_server || sanitize_paths)
-				return 0; /* Impossible... */
 			add_exclude(&exclude_list, poptGetOptArg(pc),
 				    XFLG_DEF_INCLUDE);
 			break;
 
 		case OPT_EXCLUDE_FROM:
-			if (am_server || sanitize_paths)
-				return 0; /* Impossible... */
-			arg = poptGetOptArg(pc);
-			add_exclude_file(&exclude_list, arg,
-					 XFLG_FATAL_ERRORS);
-			break;
-
 		case OPT_INCLUDE_FROM:
-			if (am_server || sanitize_paths)
-				return 0; /* Impossible... */
 			arg = poptGetOptArg(pc);
-			add_exclude_file(&exclude_list, arg,
-					 XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
+			if (sanitize_paths)
+				arg = sanitize_path(NULL, arg, NULL, 0);
+			if (server_exclude_list.head) {
+				char *cp = (char *)arg;
+				clean_fname(cp, 1);
+				if (check_exclude(&server_exclude_list, cp, 0) < 0)
+					goto options_rejected;
+			}
+			add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS
+					 | (opt == OPT_INCLUDE_FROM
+					  ? XFLG_DEF_INCLUDE : 0));
 			break;
 
 		case 'h':
-- 
2.34.1