summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2004-01-31 14:44:27 +0000
committerGerald Carter <jerry@samba.org>2004-01-31 14:44:27 +0000
commitaa10de1fe4fafee749fd0a6069d857e7945d751b (patch)
tree83e252cde2298342219517967be8a50fe674ba47
parent9751ccf2afbd59ba9ccaa41912e17c49bd4dcc06 (diff)
downloadsamba-aa10de1fe4fafee749fd0a6069d857e7945d751b.tar.gz
samba-aa10de1fe4fafee749fd0a6069d857e7945d751b.tar.bz2
samba-aa10de1fe4fafee749fd0a6069d857e7945d751b.zip
cleanup patch for bug 977 so we don't display incorrect debug messages
(This used to be commit 11093ecfb7bab1ecb16d19ac00b3e7e38dff43e2)
-rw-r--r--source3/smbd/password.c20
1 files changed, 12 insertions, 8 deletions
diff --git a/source3/smbd/password.c b/source3/smbd/password.c
index 36e3fb4738..10c6aadb1f 100644
--- a/source3/smbd/password.c
+++ b/source3/smbd/password.c
@@ -250,17 +250,21 @@ int register_vuid(auth_serversupplied_info *server_info, DATA_BLOB session_key,
return -1;
}
- /* Register a home dir service for this user */
- if ((!vuser->guest) && vuser->unix_homedir && *(vuser->unix_homedir)) {
- DEBUG(3, ("Adding/updating homes service for user '%s' using home directory: '%s'\n",
- vuser->user.unix_name, vuser->unix_homedir));
+ /* Register a home dir service for this user iff
+ (a) This is not a guest connection,
+ (b) we have a home directory defined, and
+ (c) there s not an existing static share by that name */
+
+ if ( (!vuser->guest)
+ && vuser->unix_homedir
+ && *(vuser->unix_homedir)
+ && (lp_servicenumber(vuser->user.unix_name) == -1) )
+ {
+ DEBUG(3, ("Adding/updating homes service for user '%s' using home directory: '%s'\n",
+ vuser->user.unix_name, vuser->unix_homedir));
- /* only add the home directory if there doesn't exist a static share by that name */
- if ( lp_servicenumber(vuser->user.unix_name) == -1 ) {
vuser->homes_snum = add_home_service(vuser->user.unix_name,
vuser->user.unix_name, vuser->unix_homedir);
- }
-
} else {
vuser->homes_snum = -1;
}