Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liblongpath-rsync
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liblongpath
liblongpath-rsync
Commits
cda2ae84
Commit
cda2ae84
authored
Oct 31, 1999
by
Andrew Tridgell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added "ignore errors" option in rsyncd.conf
parent
e7d6e0aa
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
3 deletions
+22
-3
flist.c
flist.c
+8
-2
loadparm.c
loadparm.c
+4
-0
receiver.c
receiver.c
+2
-1
rsyncd.conf.yo
rsyncd.conf.yo
+8
-0
No files found.
flist.c
View file @
cda2ae84
...
@@ -769,7 +769,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
...
@@ -769,7 +769,8 @@ struct file_list *send_file_list(int f,int argc,char *argv[])
/* if protocol version is >= 17 then send the io_error flag */
/* if protocol version is >= 17 then send the io_error flag */
if
(
f
!=
-
1
&&
remote_version
>=
17
)
{
if
(
f
!=
-
1
&&
remote_version
>=
17
)
{
write_int
(
f
,
io_error
);
extern
int
module_id
;
write_int
(
f
,
lp_ignore_errors
(
module_id
)
?
0
:
io_error
);
}
}
if
(
f
!=
-
1
)
{
if
(
f
!=
-
1
)
{
...
@@ -854,8 +855,13 @@ struct file_list *recv_file_list(int f)
...
@@ -854,8 +855,13 @@ struct file_list *recv_file_list(int f)
/* if protocol version is >= 17 then recv the io_error flag */
/* if protocol version is >= 17 then recv the io_error flag */
if
(
f
!=
-
1
&&
remote_version
>=
17
)
{
if
(
f
!=
-
1
&&
remote_version
>=
17
)
{
extern
int
module_id
;
if
(
lp_ignore_errors
(
module_id
))
{
read_int
(
f
);
}
else
{
io_error
|=
read_int
(
f
);
io_error
|=
read_int
(
f
);
}
}
}
if
(
list_only
)
{
if
(
list_only
)
{
int
i
;
int
i
;
...
...
loadparm.c
View file @
cda2ae84
...
@@ -117,6 +117,7 @@ typedef struct
...
@@ -117,6 +117,7 @@ typedef struct
BOOL
list
;
BOOL
list
;
BOOL
use_chroot
;
BOOL
use_chroot
;
BOOL
transfer_logging
;
BOOL
transfer_logging
;
BOOL
ignore_errors
;
char
*
uid
;
char
*
uid
;
char
*
gid
;
char
*
gid
;
char
*
hosts_allow
;
char
*
hosts_allow
;
...
@@ -147,6 +148,7 @@ static service sDefault =
...
@@ -147,6 +148,7 @@ static service sDefault =
True
,
/* list */
True
,
/* list */
True
,
/* use chroot */
True
,
/* use chroot */
False
,
/* transfer logging */
False
,
/* transfer logging */
False
,
/* ignore errors */
"nobody"
,
/* uid */
"nobody"
,
/* uid */
"nobody"
,
/* gid */
"nobody"
,
/* gid */
NULL
,
/* hosts allow */
NULL
,
/* hosts allow */
...
@@ -272,6 +274,7 @@ static struct parm_struct parm_table[] =
...
@@ -272,6 +274,7 @@ static struct parm_struct parm_table[] =
{
"include"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
include
,
NULL
,
0
},
{
"include"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
include
,
NULL
,
0
},
{
"include from"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
include_from
,
NULL
,
0
},
{
"include from"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
include_from
,
NULL
,
0
},
{
"transfer logging"
,
P_BOOL
,
P_LOCAL
,
&
sDefault
.
transfer_logging
,
NULL
,
0
},
{
"transfer logging"
,
P_BOOL
,
P_LOCAL
,
&
sDefault
.
transfer_logging
,
NULL
,
0
},
{
"ignore errors"
,
P_BOOL
,
P_LOCAL
,
&
sDefault
.
ignore_errors
,
NULL
,
0
},
{
"log format"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
log_format
,
NULL
,
0
},
{
"log format"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
log_format
,
NULL
,
0
},
{
"refuse options"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
refuse_options
,
NULL
,
0
},
{
"refuse options"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
refuse_options
,
NULL
,
0
},
{
"dont compress"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
dont_compress
,
NULL
,
0
},
{
"dont compress"
,
P_STRING
,
P_LOCAL
,
&
sDefault
.
dont_compress
,
NULL
,
0
},
...
@@ -336,6 +339,7 @@ FN_LOCAL_BOOL(lp_read_only, read_only)
...
@@ -336,6 +339,7 @@ FN_LOCAL_BOOL(lp_read_only, read_only)
FN_LOCAL_BOOL
(
lp_list
,
list
)
FN_LOCAL_BOOL
(
lp_list
,
list
)
FN_LOCAL_BOOL
(
lp_use_chroot
,
use_chroot
)
FN_LOCAL_BOOL
(
lp_use_chroot
,
use_chroot
)
FN_LOCAL_BOOL
(
lp_transfer_logging
,
transfer_logging
)
FN_LOCAL_BOOL
(
lp_transfer_logging
,
transfer_logging
)
FN_LOCAL_BOOL
(
lp_ignore_errors
,
ignore_errors
)
FN_LOCAL_STRING
(
lp_uid
,
uid
)
FN_LOCAL_STRING
(
lp_uid
,
uid
)
FN_LOCAL_STRING
(
lp_gid
,
gid
)
FN_LOCAL_STRING
(
lp_gid
,
gid
)
FN_LOCAL_STRING
(
lp_hosts_allow
,
hosts_allow
)
FN_LOCAL_STRING
(
lp_hosts_allow
,
hosts_allow
)
...
...
receiver.c
View file @
cda2ae84
...
@@ -109,11 +109,12 @@ static void delete_files(struct file_list *flist)
...
@@ -109,11 +109,12 @@ static void delete_files(struct file_list *flist)
struct
file_list
*
local_file_list
;
struct
file_list
*
local_file_list
;
int
i
,
j
;
int
i
,
j
;
char
*
name
;
char
*
name
;
extern
int
module_id
;
if
(
cvs_exclude
)
if
(
cvs_exclude
)
add_cvs_excludes
();
add_cvs_excludes
();
if
(
io_error
)
{
if
(
io_error
&&
!
lp_ignore_errors
(
module_id
)
)
{
rprintf
(
FINFO
,
"IO error encountered - skipping file deletion
\n
"
);
rprintf
(
FINFO
,
"IO error encountered - skipping file deletion
\n
"
);
return
;
return
;
}
}
...
...
rsyncd.conf.yo
View file @
cda2ae84
...
@@ -274,6 +274,14 @@ rejected. See the "hosts allow" option for more information.
...
@@ -274,6 +274,14 @@ rejected. See the "hosts allow" option for more information.
The default is no "hosts deny" option, which means all hosts can connect.
The default is no "hosts deny" option, which means all hosts can connect.
dit(bf(ignore errors)) The "ignore errors" option tells rsyncd to
ignore IO errors on the server when deciding whether to run the delete
phase of the transfer. Normally rsync skips the --delete step if any
IO errors have occurred in order to prevent disasterous deletion due
to a temporary resource shortage or other IO error. In some cases this
test is counter productive so you can use this option to turn off this
behaviour.
dit(bf(transfer logging)) The "transfer logging" option enables per-file
dit(bf(transfer logging)) The "transfer logging" option enables per-file
logging of downloads and uploads in a format somewhat similar to that
logging of downloads and uploads in a format somewhat similar to that
used by ftp daemons. If you want to customize the log formats look at
used by ftp daemons. If you want to customize the log formats look at
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment