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

ypserver not available: AUTOMOUNT server and path don't work.

Browse Source 
fix: set default values to local server / path _before_ attempting to
find the ypserver's auto.home entry.
(This used to be commit 051ec104fe)
This commit is contained in:
Samba Release Account 1998-03-24 19:21:27 +00:00
parent 5d7c8375e4
commit 1a264998ca
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source3/lib/util.c
View File

@ -3862,13 +3862,14 @@ static char *automount_lookup(char *user_name)
char *automount_server(char *user_name)
{
static pstring server_name;
#if (defined(NETGROUP) && defined (AUTOMOUNT))
int home_server_len;
/* set to default of local machine */
/* use the local machine name as the default */
/* this will be the default if AUTOMOUNT is not used or fails */
pstrcpy(server_name, local_machine);
#if (defined(NETGROUP) && defined (AUTOMOUNT))
if (lp_nis_home_map())
{
char *automount_value = automount_lookup(user_name);
@ -3881,9 +3882,6 @@ char *automount_server(char *user_name)
strncpy(server_name, automount_value, home_server_len);
server_name[home_server_len] = '\0';
}
#else
/* use the local machine name instead of the auto-map server */
pstrcpy(server_name, local_machine);
#endif
DEBUG(4,("Home server: %s\n", server_name));
@ -3899,12 +3897,14 @@ char *automount_server(char *user_name)
char *automount_path(char *user_name)
{
static pstring server_path;
#if (defined(NETGROUP) && defined (AUTOMOUNT))
char *home_path_start;
/* set to default of no string */
server_path[0] = 0;
/* use the passwd entry as the default */
/* this will be the default if AUTOMOUNT is not used or fails */
/* pstrcpy() copes with get_home_dir() returning NULL */
pstrcpy(server_path, get_home_dir(user_name));
#if (defined(NETGROUP) && defined (AUTOMOUNT))
if (lp_nis_home_map())
{
@ -3917,10 +3917,6 @@ char *automount_path(char *user_name)
strcpy(server_path, home_path_start+1);
}
}
#else
/* use the passwd entry instead of the auto-map server entry */
/* pstrcpy() copes with get_home_dir() returning NULL */
pstrcpy(server_path, get_home_dir(user_name));
#endif
DEBUG(4,("Home server path: %s\n", server_path));