-/*
- * Encode and decode standard Unix attributes and
- * Extended attributes for Win32 and
- * other non-Unix systems, or Unix systems with ACLs, ...
- *
- * Kern Sibbald, October MMII
- *
- * Version $Id$
- *
- */
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2002-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2002-2009 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
This program is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
+/*
+ * Encode and decode standard Unix attributes and
+ * Extended attributes for Win32 and
+ * other non-Unix systems, or Unix systems with ACLs, ...
+ *
+ * Kern Sibbald, October MMII
+ *
+ * Version $Id$
+ *
+ */
#include "bacula.h"
#include "find.h"
+static uid_t my_uid = 1;
+static gid_t my_gid = 1;
+static bool uid_set = false;
+
+
#if defined(HAVE_WIN32)
/* Forward referenced subroutines */
static bool set_win32_attributes(JCR *jcr, ATTR *attr, BFILE *ofd);
void unix_name_to_win32(POOLMEM **win32_name, char *name);
-void win_error(JCR *jcr, char *prefix, POOLMEM *ofile);
+void win_error(JCR *jcr, const char *prefix, POOLMEM *ofile);
HANDLE bget_handle(BFILE *bfd);
#endif /* HAVE_WIN32 */
* them in the encode_attribsEx() subroutine, but this is
* not recommended.
*/
-void encode_stat(char *buf, FF_PKT *ff_pkt, int data_stream)
+void encode_stat(char *buf, struct stat *statp, int32_t LinkFI, int data_stream)
{
char *p = buf;
- struct stat *statp = &ff_pkt->statp;
+
/*
* Encode a stat packet. I should have done this more intelligently
* with a length so that it could be easily expanded.
*p++ = ' ';
p += to_base64((int64_t)statp->st_ctime, p);
*p++ = ' ';
- p += to_base64((int64_t)ff_pkt->LinkFI, p);
+ p += to_base64((int64_t)LinkFI, p);
*p++ = ' ';
#ifdef HAVE_CHFLAGS
#if !HAVE_GCC & HAVE_SUN_OS
/* Sun compiler does not handle templates correctly */
#define plug(st, val) st = val
+ #elif __sgi
+ #define plug(st, val) st = val
#else
/* Use templates to do the casting */
template <class T> void plug(T &st, uint64_t val)
mode_t old_mask;
bool ok = true;
boffset_t fsize;
+
+ if (uid_set) {
+ my_uid = getuid();
+ my_gid = getgid();
+ uid_set = true;
+ }
#if defined(HAVE_WIN32)
if (attr->stream == STREAM_UNIX_ATTRIBUTES_EX &&
char ec1[50], ec2[50];
fsize = blseek(ofd, 0, SEEK_END);
bclose(ofd); /* first close file */
- if (attr->type == FT_REG && fsize > 0 && fsize != (boffset_t)attr->statp.st_size) {
+ if (attr->type == FT_REG && fsize > 0 && attr->statp.st_size > 0 &&
+ fsize != (boffset_t)attr->statp.st_size) {
Jmsg3(jcr, M_ERROR, 0, _("File size of restored file %s not correct. Original %s, restored %s.\n"),
attr->ofname, edit_uint64(attr->statp.st_size, ec1),
edit_uint64(fsize, ec2));
}
}
+ /*
+ * We do not restore sockets, so skip trying to restore their
+ * attributes.
+ */
+ if (attr->type == FT_SPEC && S_ISSOCK(attr->statp.st_mode)) {
+ goto bail_out;
+ }
+
ut.actime = attr->statp.st_atime;
ut.modtime = attr->statp.st_mtime;
*/
if (attr->type == FT_LNK) {
/* Change owner of link, not of real file */
- if (lchown(attr->ofname, attr->statp.st_uid, attr->statp.st_gid) < 0) {
+ if (lchown(attr->ofname, attr->statp.st_uid, attr->statp.st_gid) < 0 && my_uid == 0) {
berrno be;
Jmsg2(jcr, M_ERROR, 0, _("Unable to set file owner %s: ERR=%s\n"),
- attr->ofname, be.strerror());
+ attr->ofname, be.bstrerror());
ok = false;
}
} else {
- if (chown(attr->ofname, attr->statp.st_uid, attr->statp.st_gid) < 0) {
+ if (chown(attr->ofname, attr->statp.st_uid, attr->statp.st_gid) < 0 && my_uid == 0) {
berrno be;
Jmsg2(jcr, M_ERROR, 0, _("Unable to set file owner %s: ERR=%s\n"),
- attr->ofname, be.strerror());
+ attr->ofname, be.bstrerror());
ok = false;
}
- if (chmod(attr->ofname, attr->statp.st_mode) < 0) {
+ if (chmod(attr->ofname, attr->statp.st_mode) < 0 && my_uid == 0) {
berrno be;
Jmsg2(jcr, M_ERROR, 0, _("Unable to set file modes %s: ERR=%s\n"),
- attr->ofname, be.strerror());
+ attr->ofname, be.bstrerror());
ok = false;
}
/*
* Reset file times.
*/
- if (utime(attr->ofname, &ut) < 0) {
+ if (utime(attr->ofname, &ut) < 0 && my_uid == 0) {
berrno be;
Jmsg2(jcr, M_ERROR, 0, _("Unable to set file times %s: ERR=%s\n"),
- attr->ofname, be.strerror());
+ attr->ofname, be.bstrerror());
ok = false;
}
#ifdef HAVE_CHFLAGS
* but if the immutable bit is set, it will make the utimes()
* fail.
*/
- if (chflags(attr->ofname, attr->statp.st_flags) < 0) {
+ if (chflags(attr->ofname, attr->statp.st_flags) < 0 && my_uid == 0) {
berrno be;
Jmsg2(jcr, M_ERROR, 0, _("Unable to set file flags %s: ERR=%s\n"),
- attr->ofname, be.strerror());
+ attr->ofname, be.bstrerror());
ok = false;
}
#endif
}
+
+bail_out:
pm_strcpy(attr->ofname, "*none*");
umask(old_mask);
return ok;
* restore, we can be sure we put back the whole resource.
*/
char *p;
+
+ *attribsEx = 0; /* no extended attributes (yet) */
+ if (jcr->cmd_plugin || ff_pkt->type == FT_DELETED) {
+ return STREAM_UNIX_ATTRIBUTES;
+ }
p = attribsEx;
if (ff_pkt->flags & FO_HFSPLUS) {
p += to_base64((uint64_t)(ff_pkt->hfsinfo.rsrclength), p);
attribsEx[0] = 0; /* no extended attributes */
+ if (jcr->cmd_plugin || ff_pkt->type == FT_DELETED) {
+ return STREAM_UNIX_ATTRIBUTES;
+ }
+
unix_name_to_win32(&ff_pkt->sys_fname, ff_pkt->fname);
// try unicode version
if (p_GetFileAttributesExW) {
- POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
+ POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
make_win32_path_UTF8_2_wchar(&pwszBuf, ff_pkt->fname);
- BOOL b=p_GetFileAttributesExW((LPCWSTR) pwszBuf, GetFileExInfoStandard, (LPVOID)&atts);
+ BOOL b=p_GetFileAttributesExW((LPCWSTR)pwszBuf, GetFileExInfoStandard,
+ (LPVOID)&atts);
free_pool_memory(pwszBuf);
if (!b) {
POOLMEM *win32_ofile;
// if we have neither ansi nor wchar version, we leave
- if (!(p_SetFileAttributesW || p_SetFileAttributesA))
+ if (!(p_SetFileAttributesW || p_SetFileAttributesA)) {
return false;
+ }
if (!p || !*p) { /* we should have attributes */
Dmsg2(100, "Attributes missing. of=%s ofd=%d\n", attr->ofname, ofd->fid);
}
Dmsg1(100, "SetFileAtts %s\n", attr->ofname);
- if (!(atts.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
- {
+ if (!(atts.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)) {
if (p_SetFileAttributesW) {
- POOLMEM* pwszBuf = get_pool_memory (PM_FNAME);
+ POOLMEM* pwszBuf = get_pool_memory(PM_FNAME);
make_win32_path_UTF8_2_wchar(&pwszBuf, attr->ofname);
BOOL b=p_SetFileAttributesW((LPCWSTR)pwszBuf, atts.dwFileAttributes & SET_ATTRS);
return true;
}
-void win_error(JCR *jcr, char *prefix, POOLMEM *win32_ofile)
+void win_error(JCR *jcr, const char *prefix, POOLMEM *win32_ofile)
{
DWORD lerror = GetLastError();
LPTSTR msg;
NULL);
Dmsg3(100, "Error in %s on file %s: ERR=%s\n", prefix, win32_ofile, msg);
strip_trailing_junk(msg);
- Jmsg(jcr, M_ERROR, 0, _("Error in %s file %s: ERR=%s\n"), prefix, win32_ofile, msg);
+ Jmsg3(jcr, M_ERROR, 0, _("Error in %s file %s: ERR=%s\n"), prefix, win32_ofile, msg);
LocalFree(msg);
}
-void win_error(JCR *jcr, char *prefix, DWORD lerror)
+void win_error(JCR *jcr, const char *prefix, DWORD lerror)
{
LPTSTR msg;
FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|
projects / bacula / bacula / blobdiff