diff options
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); } |