summaryrefslogtreecommitdiff
path: root/source3/lib
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-01-23 01:52:30 +0000
committerJeremy Allison <jra@samba.org>2001-01-23 01:52:30 +0000
commit2f7c1db093504a9798cdfd9c5d08a259cb4abc46 (patch)
tree31db36db246f4f9bb42135b7526f64168f4dd6c5 /source3/lib
parent3ea544fecba9d6aa662491ea4006b57a6fb6e79f (diff)
downloadsamba-2f7c1db093504a9798cdfd9c5d08a259cb4abc46.tar.gz
samba-2f7c1db093504a9798cdfd9c5d08a259cb4abc46.tar.bz2
samba-2f7c1db093504a9798cdfd9c5d08a259cb4abc46.zip
include/vfs.h:
smbd/vfs-wrap.c: smbd/vfs.c: Added fchmod_acl and chmod_acl. lib/substitute.c: smbd/lanman.c: smbd/open.c: smbd/process.c: smbd/reply.c: smbd/service.c: Removed sessetup_user variable. Added current_user_info struct which conatins domain info etc. Added '%D' for client domain parameter. Jeremy. (This used to be commit 2844ec3d511680609d6794b8718001a1bda9e89f)
Diffstat (limited to 'source3/lib')
-rw-r--r--source3/lib/substitute.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index 0212147161..09a60cf3f1 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -26,7 +26,7 @@ extern int DEBUGLEVEL;
fstring local_machine="";
fstring remote_arch="UNKNOWN";
-pstring sesssetup_user="";
+userdom_struct current_user_info;
pstring samlogon_user="";
BOOL sam_logon_in_ssb = False;
fstring remote_proto="UNKNOWN";
@@ -206,7 +206,7 @@ void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, c
int l = sizeof(pstring) - (int)(p-str);
switch (*(p+1)) {
- case 'U' : string_sub(p,"%U",sam_logon_in_ssb?samlogon_user:sesssetup_user,l); break;
+ case 'U' : string_sub(p,"%U",sam_logon_in_ssb?samlogon_user:current_user_info.smb_name,l); break;
case 'G' :
if ((pass = Get_Pwnam(user,False))!=NULL) {
string_sub(p,"%G",gidtoname(pass->pw_gid),l);
@@ -214,6 +214,7 @@ void standard_sub_advanced(int snum, char *user, char *connectpath, gid_t gid, c
p += 2;
}
break;
+ case 'D' : string_sub(p,"%D", current_user_info.domain,l); break;
case 'N' : string_sub(p,"%N", automount_server(user),l); break;
case 'H':
if ((home = get_user_home_dir(user))) {