gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 00:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix setup of templates to be done *before* user name is changed.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@12533 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-02-13 21:04:19 +00:00
parent 31cd49b047
commit 32ac540564
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Source/NSUser.m
View file

@ -80,13 +80,13 @@ GSSetUserName(NSString* name)
if ([theUserName isEqualToString: name] == NO)
{
/*
* We must ensure that setupPathNames() has been called to set
* up the template user path from the environment variable.
* We must ensure that userDirectory() has been called to set
* up the template user paths from the environment variables.
* Then we can destroy the cached user path so that next time
* anything wants it, it will be regenerated from the template
* and the new user details.
*/
setupPathNames();
userDirectory(theUserName, YES);
DESTROY(gnustep_user_root);
/*
* Next we can set up the new user name, and reset the user defaults
@ -454,6 +454,22 @@ userDirectory(NSString *name, BOOL defaults)
NSCAssert([name length] > 0, NSInvalidArgumentException);
/**
* If we don't have templates set up, ensure that it's set up for
* the original user by pre-calling ourself for that user.
*/
if ([name isEqual: NSUserName()] == NO)
{
if (defsTemplate == nil)
{
userDirectory(NSUserName(), YES);
}
if (fileTemplate == nil)
{
userDirectory(NSUserName(), NO);
}
}
if (defaults == YES)
{
template = defsTemplate;
@ -462,14 +478,6 @@ userDirectory(NSString *name, BOOL defaults)
{
template = fileTemplate;
}
/**
* If we don't have a template set up, ensure that it's set up for
* the original user by pre-calling ourself for that user.
*/
if (template == nil && [name isEqual: NSUserName()] == NO)
{
userDirectory(NSUserName(), defaults);
}
home = NSHomeDirectoryForUser(name);
[gnustep_global_lock lock];