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)
return local_machine;
}
+
+/*
+ setup the string used by %U substitution
+*/
+void sub_set_smb_name(const char *name)
+{
+ fstring tmp;
+
+ /* don't let anonymous logins override the name */
+ if (! *name) return;
+
+ 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.
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);
}
/****************************************************************************
}
standard_sub_advanced(snum, cached_user, "", -1,
- current_user_info.smb_name, str, len);
+ smb_user_name, str, len);
}
}
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())) {
set_remote_machine_name(machine);
+ /* setup the string used by %U */
+ sub_set_smb_name(user);
+
reload_services(True);
#if 0
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());
}