git://git.onelab.eu
/
util-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge 0.30.214.
[util-vserver.git]
/
src
/
secure-mount.c
diff --git
a/src/secure-mount.c
b/src/secure-mount.c
index
afab07c
..
5fba02d
100644
(file)
--- a/
src/secure-mount.c
+++ b/
src/secure-mount.c
@@
-1,4
+1,4
@@
-// $Id: secure-mount.c 24
03 2006-11-24 23:06:08
Z dhozac $ --*- c++ -*--
+// $Id: secure-mount.c 24
80 2007-01-28 11:35:19
Z dhozac $ --*- c++ -*--
// Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
//
// Copyright (C) 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
//
@@
-70,6
+70,7
@@
struct MountInfo {
unsigned long xflag;
unsigned long mask;
char * data;
unsigned long xflag;
unsigned long mask;
char * data;
+ char * data_parsed;
};
struct Options {
};
struct Options {
@@
-121,7
+122,7
@@
static struct FstabOption {
unsigned long const xflag;
bool const is_dflt;
} const FSTAB_OPTIONS[] = {
unsigned long const xflag;
bool const is_dflt;
} const FSTAB_OPTIONS[] = {
- { "defaults",
0,
(MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|
+ { "defaults",
MS_NODEV,
(MS_RDONLY|MS_NOSUID|MS_NODEV|MS_NOEXEC|
MS_SYNCHRONOUS), 0, false },
{ "rbind", MS_BIND|MS_REC, MS_BIND|MS_REC, 0, false },
{ "bind", MS_BIND, MS_BIND, 0, false },
MS_SYNCHRONOUS), 0, false },
{ "rbind", MS_BIND|MS_REC, MS_BIND|MS_REC, 0, false },
{ "bind", MS_BIND, MS_BIND, 0, false },
@@
-431,7
+432,7
@@
mountSingle(struct MountInfo const *mnt, struct Options const *opt)
if (canHandleInternal(mnt)) {
if (mount(mnt->src, ".",
mnt->type ? mnt->type : "",
if (canHandleInternal(mnt)) {
if (mount(mnt->src, ".",
mnt->type ? mnt->type : "",
- mnt->flag, mnt->data)==-1) {
+ mnt->flag, mnt->data
_parsed
)==-1) {
perror("secure-mount: mount()");
return false;
}
perror("secure-mount: mount()");
return false;
}
@@
-493,7
+494,7
@@
transformOptionList(struct MountInfo *info, size_t UNUSED *col)
} while (*ptr!='\0');
} while (*ptr!='\0');
- info->data = data;
+ info->data
_parsed
= data;
return true;
}
return true;
}