diff options
| author | Luke Leighton <lkcl@samba.org> | 1999-12-12 21:00:35 +0000 |
|---|---|---|
| committer | Luke Leighton <lkcl@samba.org> | 1999-12-12 21:00:35 +0000 |
| commit | f6276724bafdb6145c0c7b565172d80cb04516ea (patch) | |
| tree | dc898b2020b32c12b02724fb7209bde351afe47e /source3/lib | |
| parent | 4f8a24522c683761c6f2ee23dba56f6c7913377b (diff) | |
| download | samba-f6276724bafdb6145c0c7b565172d80cb04516ea.tar.gz samba-f6276724bafdb6145c0c7b565172d80cb04516ea.tar.bz2 samba-f6276724bafdb6145c0c7b565172d80cb04516ea.zip | |
changed function name of get_home_dir() to get_unixhome_dir(), to stop
clash with gnu readline library.
fixed issue with [homes] service not being there - call lp_add_home()
just before starting the msrpc processing.
(This used to be commit 054195df9b6187c663ede5cf4489499abbdc29fc)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/username.c | 4 | ||||
| -rw-r--r-- | source3/lib/util.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/lib/username.c b/source3/lib/username.c index 9f51d06642..23bdb54faf 100644 --- a/source3/lib/username.c +++ b/source3/lib/username.c @@ -302,7 +302,7 @@ char *uidtoname(uid_t uid) /**************************************************************************** get a users home directory. ****************************************************************************/ -char *get_home_dir(char *user) +char *get_unixhome_dir(char *user) { const struct passwd *pass; static pstring home_dir; @@ -312,7 +312,7 @@ char *get_home_dir(char *user) if (pass == NULL || pass->pw_dir == NULL) return(NULL); pstrcpy(home_dir, pass->pw_dir); - DEBUG(10,("get_home_dir: returning %s for user %s\n", home_dir, user)); + DEBUG(10,("get_smbhome_dir: returning %s for user %s\n", home_dir, user)); return home_dir; } diff --git a/source3/lib/util.c b/source3/lib/util.c index 7d099282f8..25769298be 100644 --- a/source3/lib/util.c +++ b/source3/lib/util.c @@ -2091,8 +2091,8 @@ static char *automount_path(char *user_name) /* use the passwd entry as the default */ /* this will be the default if WITH_AUTOMOUNT is not used or fails */ - /* pstrcpy() copes with get_home_dir() returning NULL */ - pstrcpy(server_path, get_home_dir(user_name)); + /* pstrcpy() copes with get_unixhome_dir() returning NULL */ + pstrcpy(server_path, get_unixhome_dir(user_name)); #if (defined(HAVE_NETGROUP) && defined (WITH_AUTOMOUNT)) @@ -2221,7 +2221,7 @@ void standard_sub(connection_struct *conn,char *str) switch (*(p+1)) { case 'H': - if ((home = get_home_dir(conn->user)) != NULL) { + if ((home = get_unixhome_dir(conn->user)) != NULL) { string_sub(p,"%H",home); } else { p += 2; |