diff options
| author | Jeremy Allison <jra@samba.org> | 2010-02-11 15:16:23 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2010-02-11 15:16:23 -0800 |
| commit | a6f402ad87ff0ae14d57d97278d67d0ceaaa1d82 (patch) | |
| tree | 7fdfb01de6c8b093ebab210fae4e8b6df91b1b51 /source3/smbd/service.c | |
| parent | 4ff7f6ed3634f9a45b1ebdc965152bbada72b49d (diff) | |
| download | samba-a6f402ad87ff0ae14d57d97278d67d0ceaaa1d82.tar.gz samba-a6f402ad87ff0ae14d57d97278d67d0ceaaa1d82.tar.bz2 samba-a6f402ad87ff0ae14d57d97278d67d0ceaaa1d82.zip | |
Remove lp_safe_widelinks() -> convert to just lp_widelinks. Suggestion from Volker.
Create widelinks_warning(int snum) to cover the message needed in make_connection.
Jeremy.
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 45df7c14fe..7dddff5259 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -857,10 +857,11 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, conn); } -/* ROOT Activities: */ - /* explicitly check with lp_widelinks() instead of using - * lp_safe_widelinks() here so that we can correctly warn +/* ROOT Activities: */ + /* explicitly check widelinks here so that we can correctly warn * in the logs. */ + widelinks_warning(snum); + if (lp_unix_extensions() && lp_widelinks(snum)) { DEBUG(0,("Share '%s' has wide links and unix extensions enabled. " "These parameters are incompatible. " @@ -973,7 +974,7 @@ connection_struct *make_connection_snum(struct smbd_server_connection *sconn, * below this directory. We must do this after the VFS init as we * depend on the realpath() pointer in the vfs table. JRA. */ - if (!lp_safe_widelinks(snum)) { + if (!lp_widelinks(snum)) { if (!canonicalize_connect_path(conn)) { DEBUG(0, ("canonicalize_connect_path failed " "for service %s, path %s\n", |