sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-01 21:18:10 +03:00
Code

a better for for using %U in smb.conf

Browse Source 
this follows the method used for remote_machine and also fixes the
problem of anonymous connections clobbering the string
(This used to be commit 9ead4fc3c3)
This commit is contained in:
Andrew Tridgell 2002-11-19 23:44:24 +00:00
parent 22a08a5b12
commit 18e55a69ff
3 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source3/lib/substitute.c
View File

@ -26,7 +26,8 @@ fstring remote_arch="UNKNOWN";
userdom_struct current_user_info;
fstring remote_proto="UNKNOWN";
static fstring remote_machine="";
static fstring remote_machine;
static fstring smb_user_name;
void set_local_machine_name(const char* local_name)
@ -59,6 +60,21 @@ const char* get_local_machine_name(void)
return local_machine;
}
/*
setup the string used by %U substitution
*/
void sub_set_smb_name(const char *name)
{
fstring tmp;
fstrcpy(tmp,name);
trim_string(tmp," "," ");
strlower(tmp);
alpha_strcpy(smb_user_name,tmp,SAFE_NETBIOS_CHARS,sizeof(smb_user_name)-1);
}
/*******************************************************************
Given a pointer to a %$(NAME) expand it as an environment variable.
Return the number of characters by which the pointer should be advanced.
@ -676,20 +692,20 @@ char *alloc_sub_advanced(int snum, const char *user,
void standard_sub_conn(connection_struct *conn, char *str, size_t len)
{
standard_sub_advanced(SNUM(conn), conn->user, conn->connectpath,
conn->gid, current_user_info.smb_name, str, len);
conn->gid, smb_user_name, str, len);
}
char *talloc_sub_conn(TALLOC_CTX *mem_ctx, connection_struct *conn, char *str)
{
return talloc_sub_advanced(mem_ctx, SNUM(conn), conn->user,
conn->connectpath, conn->gid,
current_user_info.smb_name, str);
smb_user_name, str);
}
char *alloc_sub_conn(connection_struct *conn, char *str)
{
return alloc_sub_advanced(SNUM(conn), conn->user, conn->connectpath,
conn->gid, current_user_info.smb_name, str);
conn->gid, smb_user_name, str);
}
/****************************************************************************
@ -710,5 +726,5 @@ void standard_sub_snum(int snum, char *str, size_t len)
}
standard_sub_advanced(snum, cached_user, "", -1,
current_user_info.smb_name, str, len);
smb_user_name, str, len);
}

3
source3/smbd/service.c
View File

@ -612,9 +612,6 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
return NULL;
}
/* the %U substitution may have changed */
reload_services(True);
/* Remember that a different vuid can connect later without these checks... */
/* Preexecs are done here as they might make the dir we are to ChDir to below */

11
source3/smbd/sesssetup.c
View File

@ -159,6 +159,11 @@ static int reply_spnego_kerberos(connection_struct *conn,
}
ads_destroy(&ads);
/* setup the string used by %U */
sub_set_smb_name(user);
reload_services(True);
/* the password is good - let them in */
pw = Get_Pwnam(user);
if (!pw && !strstr(user, lp_winbind_separator())) {
@ -423,6 +428,9 @@ static int reply_spnego_auth(connection_struct *conn, char *inbuf, char *outbuf,
set_remote_machine_name(machine);
/* setup the string used by %U */
sub_set_smb_name(user);
reload_services(True);
#if 0
@ -749,6 +757,9 @@ int reply_sesssetup_and_X(connection_struct *conn, char *inbuf,char *outbuf,
return ERROR_NT(NT_STATUS_UNSUCCESSFUL);
}
pstrcpy(sub_user, user);
/* setup the string used by %U */
sub_set_smb_name(user);
} else {
pstrcpy(sub_user, lp_guestaccount());
}