diff options
Diffstat (limited to 'rdiff-backup/rdiff_backup')
-rw-r--r-- | rdiff-backup/rdiff_backup/cmodule.c | 32 | ||||
-rw-r--r-- | rdiff-backup/rdiff_backup/rpath.py | 10 |
2 files changed, 37 insertions, 5 deletions
diff --git a/rdiff-backup/rdiff_backup/cmodule.c b/rdiff-backup/rdiff_backup/cmodule.c index 6fafde7..f6a44a3 100644 --- a/rdiff-backup/rdiff_backup/cmodule.c +++ b/rdiff-backup/rdiff_backup/cmodule.c @@ -368,6 +368,36 @@ static PyObject *acl_unquote(PyObject *self, PyObject *args) return Py_BuildValue("s", unquote(s)); } +/* ------------- lchown taken from Python's posixmodule.c -------------- */ +/* duplicate here to avoid v2.3 requirement */ + +static PyObject * +posix_error_with_allocated_filename(char* name) +{ + PyObject *rc = PyErr_SetFromErrnoWithFilename(PyExc_OSError, name); + PyMem_Free(name); + return rc; +} + +static PyObject * +posix_lchown(PyObject *self, PyObject *args) +{ + char *path = NULL; + int uid, gid; + int res; + if (!PyArg_ParseTuple(args, "etii:lchown", + Py_FileSystemDefaultEncoding, &path, + &uid, &gid)) + return NULL; + Py_BEGIN_ALLOW_THREADS + res = lchown(path, (uid_t) uid, (gid_t) gid); + Py_END_ALLOW_THREADS + if (res < 0) + return posix_error_with_allocated_filename(path); + PyMem_Free(path); + Py_INCREF(Py_None); + return Py_None; +} /* ------------- Python export lists -------------------------------- */ @@ -381,6 +411,8 @@ static PyMethodDef CMethods[] = { "Quote string, escaping non-printables"}, {"acl_unquote", acl_unquote, METH_VARARGS, "Unquote string, producing original input to quote"}, + {"lchown", posix_lchown, METH_VARARGS, + "Like chown, but don't follow symlinks"}, {NULL, NULL, 0, NULL} }; diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index 0b17934..2816c91 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -152,13 +152,13 @@ def copy_attribs(rpin, rpout): """ log.Log("Copying attributes from %s to %s" % (rpin.index, rpout.path), 7) assert rpin.lstat() == rpout.lstat() or rpin.isspecial() - if rpin.issym(): return # symlinks have no valid attributes + if Globals.change_ownership: rpout.chown(*user_group.map_rpath(rpin)) + if rpin.issym(): return # symlinks don't have times or perms if Globals.resource_forks_write and rpin.isreg(): rpout.write_resource_fork(rpin.get_resource_fork()) if Globals.carbonfile_write and rpin.isreg(): rpout.write_carbonfile(rpin.get_carbonfile()) if Globals.eas_write: rpout.write_ea(rpin.get_ea()) - if Globals.change_ownership: rpout.chown(*user_group.map_rpath(rpin)) rpout.chmod(rpin.getperms()) if Globals.acls_write: rpout.write_acl(rpin.get_acl()) if not rpin.isdev(): rpout.setmtime(rpin.getmtime()) @@ -173,13 +173,13 @@ def copy_attribs_inc(rpin, rpout): """ log.Log("Copying inc attrs from %s to %s" % (rpin.index, rpout.path), 7) check_for_files(rpin, rpout) - if rpin.issym(): return # symlinks have no valid attributes + if Globals.change_ownership: apply(rpout.chown, rpin.getuidgid()) + if rpin.issym(): return # symlinks don't have times or perms if Globals.resource_forks_write and rpin.isreg() and rpout.isreg(): rpout.write_resource_fork(rpin.get_resource_fork()) if Globals.carbonfile_write and rpin.isreg() and rpout.isreg(): rpout.write_carbonfile(rpin.get_carbonfile()) if Globals.eas_write: rpout.write_ea(rpin.get_ea()) - if Globals.change_ownership: apply(rpout.chown, rpin.getuidgid()) if rpin.isdir() and not rpout.isdir(): rpout.chmod(rpin.getperms() & 0777) else: rpout.chmod(rpin.getperms()) @@ -775,7 +775,7 @@ class RPath(RORPath): def chown(self, uid, gid): """Set file's uid and gid""" - self.conn.os.chown(self.path, uid, gid) + self.conn.C.lchown(self.path, uid, gid) self.data['uid'] = uid self.data['gid'] = gid |