diff options
| author | Jeremy Allison <jra@samba.org> | 2006-02-02 20:44:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:06:21 -0500 |
| commit | d14af63e6ab600eb3ac705f2f425c860e927553a (patch) | |
| tree | 9be5b1da9836c61c7b1bf2df72df7014944b8599 /source3/lib | |
| parent | 206cbff8b72a2ccc41e52b45097976f4511bfdec (diff) | |
| download | samba-d14af63e6ab600eb3ac705f2f425c860e927553a.tar.gz samba-d14af63e6ab600eb3ac705f2f425c860e927553a.tar.bz2 samba-d14af63e6ab600eb3ac705f2f425c860e927553a.zip | |
r13293: Rather a big patch I'm afraid, but this should fix bug #3347
by saving the UNIX token used to set a delete on close flag,
and using it when doing the delete. libsmbsharemodes.so still
needs updating to cope with this change.
Samba4 torture tests to follow.
Jeremy.
(This used to be commit 23f16cbc2e8cde97c486831e26bcafd4ab4a9654)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/smbrun.c | 8 | ||||
| -rw-r--r-- | source3/lib/substitute.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source3/lib/smbrun.c b/source3/lib/smbrun.c index 6d6d7817f1..4f5525039f 100644 --- a/source3/lib/smbrun.c +++ b/source3/lib/smbrun.c @@ -58,8 +58,8 @@ outfd (or discard it if outfd is NULL). int smbrun(const char *cmd, int *outfd) { pid_t pid; - uid_t uid = current_user.uid; - gid_t gid = current_user.gid; + uid_t uid = current_user.ut.uid; + gid_t gid = current_user.ut.gid; /* * Lose any kernel oplock capabilities we may have. @@ -189,8 +189,8 @@ sends the provided secret to the child stdin. int smbrunsecret(const char *cmd, const char *secret) { pid_t pid; - uid_t uid = current_user.uid; - gid_t gid = current_user.gid; + uid_t uid = current_user.ut.uid; + gid_t gid = current_user.ut.gid; int ifd[2]; /* diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c index 344f6e06fd..30e1d97ca9 100644 --- a/source3/lib/substitute.c +++ b/source3/lib/substitute.c @@ -840,11 +840,11 @@ void standard_sub_snum(int snum, char *str, size_t len) /* calling uidtoname() on every substitute would be too expensive, so we cache the result here as nearly every call is for the same uid */ - if (cached_uid != current_user.uid) { - fstrcpy(cached_user, uidtoname(current_user.uid)); - cached_uid = current_user.uid; + if (cached_uid != current_user.ut.uid) { + fstrcpy(cached_user, uidtoname(current_user.ut.uid)); + cached_uid = current_user.ut.uid; } - standard_sub_advanced(snum, cached_user, "", current_user.gid, + standard_sub_advanced(snum, cached_user, "", current_user.ut.gid, smb_user_name, str, len); } |