Fix the build when realpath doesn't take null
[samba.git] / source3 / smbd / service.c
index 048c0f00b1aa616fa5159dccc302a592b222d5e3..c3972391f320c54de4fa8ccadb30cfbd2167bd55 100644 (file)
@@ -5,7 +5,7 @@
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 
 extern userdom_struct current_user_info;
 
+static bool canonicalize_connect_path(connection_struct *conn)
+{
+#ifdef REALPATH_TAKES_NULL
+       bool ret;
+       char *resolved_name = SMB_VFS_REALPATH(conn,conn->connectpath,NULL);
+       if (!resolved_name) {
+               return false;
+       }
+       ret = set_conn_connectpath(conn,resolved_name);
+       SAFE_FREE(resolved_name);
+       return ret;
+#else
+#ifdef PATH_MAX
+        char resolved_name_buf[PATH_MAX+1];
+#else
+        pstring resolved_name_buf;
+#endif
+       char *resolved_name = SMB_VFS_REALPATH(conn,conn->connectpath,resolved_name_buf);
+       if (!resolved_name) {
+               return false;
+       }
+       return set_conn_connectpath(conn,resolved_name);
+#endif /* REALPATH_TAKES_NULL */
+}
+
 /****************************************************************************
  Ensure when setting connectpath it is a canonicalized (no ./ // or ../)
  absolute path stating in / and not ending in /.
  Observent people will notice a similarity between this and check_path_syntax :-).
 ****************************************************************************/
 
-void set_conn_connectpath(connection_struct *conn, const pstring connectpath)
+bool set_conn_connectpath(connection_struct *conn, const char *connectpath)
 {
-       pstring destname;
-       char *d = destname;
+       char *destname;
+       char *d;
        const char *s = connectpath;
-        BOOL start_of_name_component = True;
+        bool start_of_name_component = true;
+
+       destname = SMB_STRDUP(connectpath);
+       if (!destname) {
+               return false;
+       }
+       d = destname;
 
        *d++ = '/'; /* Always start with root. */
 
@@ -118,7 +148,7 @@ void set_conn_connectpath(connection_struct *conn, const pstring connectpath)
                                        break;
                        }
                }
-               start_of_name_component = False;
+               start_of_name_component = false;
        }
        *d = '\0';
 
@@ -131,13 +161,15 @@ void set_conn_connectpath(connection_struct *conn, const pstring connectpath)
                lp_servicename(SNUM(conn)), destname ));
 
        string_set(&conn->connectpath, destname);
+       SAFE_FREE(destname);
+       return true;
 }
 
 /****************************************************************************
  Load parameters specific to a connection/service.
 ****************************************************************************/
 
-BOOL set_current_service(connection_struct *conn, uint16 flags, BOOL do_chdir)
+bool set_current_service(connection_struct *conn, uint16 flags, bool do_chdir)
 {
        static connection_struct *last_conn;
        static uint16 last_flags;
@@ -231,15 +263,15 @@ int add_home_service(const char *service, const char *username, const char *home
 
 static int load_registry_service(const char *servicename)
 {
-       REGISTRY_KEY *key;
+       struct registry_key *key;
        char *path;
        WERROR err;
 
-       uint32 i, num_values;
-       char **value_names;
-       struct registry_value **values = NULL;
+       uint32 i;
+       char *value_name;
+       struct registry_value *value;
 
-       int res;
+       int res = -1;
 
        if (!lp_registry_shares()) {
                return -1;
@@ -249,65 +281,55 @@ static int load_registry_service(const char *servicename)
                return -1;
        }
 
-       err = regkey_open_internal(NULL, &key, path, get_root_nt_token(),
-                                  REG_KEY_READ);
+       err = reg_open_path(NULL, path, REG_KEY_READ, get_root_nt_token(),
+                           &key);
        SAFE_FREE(path);
 
        if (!W_ERROR_IS_OK(err)) {
                return -1;
        }
 
-       err = registry_fetch_values(NULL, key, &num_values, &value_names,
-                                   &values);
-
-       TALLOC_FREE(key);
-
-       if (!W_ERROR_IS_OK(err)) {
-               goto error;
-       }
-
        res = lp_add_service(servicename, -1);
        if (res == -1) {
                goto error;
        }
 
-       for (i=0; i<num_values; i++) {
-               switch (values[i]->type) {
+       for (i=0;
+            W_ERROR_IS_OK(reg_enumvalue(key, key, i, &value_name, &value));
+            i++) {
+               switch (value->type) {
                case REG_DWORD: { 
-                       char *val;
-                       if (asprintf(&val, "%d", values[i]->v.dword) == -1) {
+                       char *tmp;
+                       if (asprintf(&tmp, "%d", value->v.dword) == -1) {
                                continue;
                        }
-                       lp_do_parameter(res, value_names[i], val);
-                       SAFE_FREE(val);
+                       lp_do_parameter(res, value_name, tmp);
+                       SAFE_FREE(tmp);
                        break;
                }
                case REG_SZ: {
-                       lp_do_parameter(res, value_names[i],
-                                       values[i]->v.sz.str);
+                       lp_do_parameter(res, value_name, value->v.sz.str);
                        break;
                }
                default:
                        /* Ignore all the rest */
                        break;
                }
-       }
 
-       TALLOC_FREE(value_names);
-       TALLOC_FREE(values);
-       return res;
+               TALLOC_FREE(value_name);
+               TALLOC_FREE(value);
+       }
 
  error:
 
-       TALLOC_FREE(value_names);
-       TALLOC_FREE(values);
-       return -1;
+       TALLOC_FREE(key);
+       return res;
 }
 
 void load_registry_shares(void)
 {
-       REGISTRY_KEY *key;
-       REGSUBKEY_CTR *keys;
+       struct registry_key *key;
+       char *name;
        WERROR err;
        int i;
 
@@ -315,26 +337,18 @@ void load_registry_shares(void)
                return;
        }
 
-       if (!(keys = TALLOC_ZERO_P(NULL, REGSUBKEY_CTR))) {
-               goto done;
-       }
-
-       err = regkey_open_internal(keys, &key, KEY_SMBCONF,
-                                  get_root_nt_token(), REG_KEY_READ);
+       err = reg_open_path(NULL, KEY_SMBCONF, REG_KEY_READ,
+                           get_root_nt_token(), &key);
        if (!(W_ERROR_IS_OK(err))) {
-               goto done;
-       }
-
-       if (fetch_reg_keys(key, keys) == -1) {
-               goto done;
+               return;
        }
 
-       for (i=0; i<keys->num_subkeys; i++) {
-               load_registry_service(keys->subkeys[i]);
+       for (i=0; W_ERROR_IS_OK(reg_enumkey(key, key, i, &name, NULL)); i++) {
+               load_registry_service(name);
+               TALLOC_FREE(name);
        }
 
- done:
-       TALLOC_FREE(keys);
+       TALLOC_FREE(key);
        return;
 }
 
@@ -395,6 +409,17 @@ int find_service(fstring service)
        if (iService < 0) {
        }
 
+       if (iService < 0) {
+               iService = load_registry_service(service);
+       }
+
+       /* Is it a usershare service ? */
+       if (iService < 0 && *lp_usershare_path()) {
+               /* Ensure the name is canonicalized. */
+               strlower_m(service);
+               iService = load_usershare_service(service);
+       }
+
        /* just possibly it's a default service? */
        if (iService < 0) {
                char *pdefservice = lp_defaultservice();
@@ -405,27 +430,29 @@ int find_service(fstring service)
                         * could get overwritten by the recursive find_service() call
                         * below. Fix from Josef Hinteregger <joehtg@joehtg.co.at>.
                         */
-                       pstring defservice;
-                       pstrcpy(defservice, pdefservice);
+                       char *defservice = SMB_STRDUP(pdefservice);
+
+                       if (!defservice) {
+                               goto fail;
+                       }
+
+                       /* Disallow anything except explicit share names. */
+                       if (strequal(defservice,HOMES_NAME) ||
+                                       strequal(defservice, PRINTERS_NAME) ||
+                                       strequal(defservice, "IPC$")) {
+                               SAFE_FREE(defservice);
+                               goto fail;
+                       }
+
                        iService = find_service(defservice);
                        if (iService >= 0) {
                                all_string_sub(service, "_","/",0);
                                iService = lp_add_service(service, iService);
                        }
+                       SAFE_FREE(defservice);
                }
        }
 
-       if (iService < 0) {
-               iService = load_registry_service(service);
-       }
-
-       /* Is it a usershare service ? */
-       if (iService < 0 && *lp_usershare_path()) {
-               /* Ensure the name is canonicalized. */
-               strlower_m(service);
-               iService = load_usershare_service(service);
-       }
-
        if (iService >= 0) {
                if (!VALID_SNUM(iService)) {
                        DEBUG(0,("Invalid snum %d for %s\n",iService, service));
@@ -433,6 +460,8 @@ int find_service(fstring service)
                }
        }
 
+  fail:
+
        if (iService < 0)
                DEBUG(3,("find_service() failed to find service %s\n", service));
 
@@ -486,43 +515,28 @@ static NTSTATUS share_sanity_checks(int snum, fstring dev)
        return NT_STATUS_OK;
 }
 
-static NTSTATUS find_forced_user(int snum, BOOL vuser_is_guest,
-                                uid_t *uid, gid_t *gid, fstring username,
-                                struct nt_user_token **token)
+static NTSTATUS find_forced_user(connection_struct *conn, bool vuser_is_guest, fstring username)
 {
-       TALLOC_CTX *mem_ctx;
+       int snum = conn->params->service;
        char *fuser, *found_username;
-       struct nt_user_token *tmp_token;
        NTSTATUS result;
 
-       if (!(mem_ctx = talloc_new(NULL))) {
-               DEBUG(0, ("talloc_new failed\n"));
-               return NT_STATUS_NO_MEMORY;
-       }
-
-       if (!(fuser = talloc_string_sub(mem_ctx, lp_force_user(snum), "%S",
+       if (!(fuser = talloc_string_sub(conn->mem_ctx, lp_force_user(snum), "%S",
                                        lp_servicename(snum)))) {
-               TALLOC_FREE(mem_ctx);
                return NT_STATUS_NO_MEMORY;
-               
        }
 
-       result = create_token_from_username(mem_ctx, fuser, vuser_is_guest,
-                                           uid, gid, &found_username,
-                                           &tmp_token);
+       result = create_token_from_username(conn->mem_ctx, fuser, vuser_is_guest,
+                                           &conn->uid, &conn->gid, &found_username,
+                                           &conn->nt_user_token);
        if (!NT_STATUS_IS_OK(result)) {
-               TALLOC_FREE(mem_ctx);
                return result;
        }
 
-       if (!(*token = dup_nt_token(NULL, tmp_token))) {
-               TALLOC_FREE(mem_ctx);
-               return NT_STATUS_NO_MEMORY;
-       }
-
        fstrcpy(username, found_username);
 
-       TALLOC_FREE(mem_ctx);
+       TALLOC_FREE(fuser);
+       TALLOC_FREE(found_username);
        return NT_STATUS_OK;
 }
 
@@ -533,7 +547,7 @@ static NTSTATUS find_forced_user(int snum, BOOL vuser_is_guest,
  * one found.
  */
 
-static NTSTATUS find_forced_group(BOOL force_user,
+static NTSTATUS find_forced_group(bool force_user,
                                  int snum, const char *username,
                                  DOM_SID *pgroup_sid,
                                  gid_t *pgid)
@@ -543,7 +557,7 @@ static NTSTATUS find_forced_group(BOOL force_user,
        DOM_SID group_sid;
        enum lsa_SidType type;
        char *groupname;
-       BOOL user_must_be_member = False;
+       bool user_must_be_member = False;
        gid_t gid;
 
        ZERO_STRUCTP(pgroup_sid);
@@ -634,12 +648,14 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                                               NTSTATUS *status)
 {
        struct passwd *pass = NULL;
-       BOOL guest = False;
+       bool guest = False;
        connection_struct *conn;
        SMB_STRUCT_STAT st;
        fstring user;
        fstring dev;
        int ret;
+       char addr[INET6_ADDRSTRLEN];
+       bool on_err_call_dis_hook = false;
 
        *user = 0;
        fstrcpy(dev, pdev);
@@ -656,12 +672,14 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                return NULL;
        }
 
+       conn->params->service = snum;
        conn->nt_user_token = NULL;
 
        if (lp_guest_only(snum)) {
                const char *guestname = lp_guestaccount();
                NTSTATUS status2;
-               char *found_username;
+               char *found_username = NULL;
+
                guest = True;
                pass = getpwnam_alloc(NULL, guestname);
                if (!pass) {
@@ -671,11 +689,12 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                        *status = NT_STATUS_NO_SUCH_USER;
                        return NULL;
                }
-               status2 = create_token_from_username(NULL, pass->pw_name, True,
+               status2 = create_token_from_username(conn->mem_ctx, pass->pw_name, True,
                                                     &conn->uid, &conn->gid,
                                                     &found_username,
                                                     &conn->nt_user_token);
                if (!NT_STATUS_IS_OK(status2)) {
+                       TALLOC_FREE(pass);
                        conn_free(conn);
                        *status = status2;
                        return NULL;
@@ -683,6 +702,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                fstrcpy(user, found_username);
                string_set(&conn->user,user);
                conn->force_user = True;
+               TALLOC_FREE(found_username);
                TALLOC_FREE(pass);
                DEBUG(3,("Guest only user %s\n",user));
        } else if (vuser) {
@@ -715,7 +735,8 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                guest = vuser->guest; 
        } else if (lp_security() == SEC_SHARE) {
                NTSTATUS status2;
-               char *found_username;
+               char *found_username = NULL;
+
                /* add it as a possible user name if we 
                   are in share mode security */
                add_session_user(lp_servicename(snum));
@@ -728,7 +749,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                        return NULL;
                }
                pass = Get_Pwnam(user);
-               status2 = create_token_from_username(NULL, pass->pw_name, True,
+               status2 = create_token_from_username(conn->mem_ctx, pass->pw_name, True,
                                                     &conn->uid, &conn->gid,
                                                     &found_username,
                                                     &conn->nt_user_token);
@@ -739,6 +760,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                }
                fstrcpy(user, found_username);
                string_set(&conn->user,user);
+               TALLOC_FREE(found_username);
                conn->force_user = True;
        } else {
                DEBUG(0, ("invalid VUID (vuser) but not in security=share\n"));
@@ -749,11 +771,11 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
 
        add_session_user(user);
 
-       safe_strcpy(conn->client_address, client_addr(), 
-                   sizeof(conn->client_address)-1);
+       safe_strcpy(conn->client_address,
+                       client_addr(get_client_fd(),addr,sizeof(addr)), 
+                       sizeof(conn->client_address)-1);
        conn->num_files_open = 0;
        conn->lastused = conn->lastused_count = time(NULL);
-       conn->params->service = snum;
        conn->used = True;
        conn->printer = (strncmp(dev,"LPT",3) == 0);
        conn->ipc = ( (strncmp(dev,"IPC",3) == 0) ||
@@ -766,7 +788,7 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                 * insensitive for now. */
                conn->case_sensitive = False;
        } else {
-               conn->case_sensitive = (BOOL)lp_casesensitive(snum);
+               conn->case_sensitive = (bool)lp_casesensitive(snum);
        }
 
        conn->case_preserve = lp_preservecase(snum);
@@ -791,10 +813,9 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
        if (*lp_force_user(snum)) {
                NTSTATUS status2;
 
-               status2 = find_forced_user(snum,
-                                          (vuser != NULL) && vuser->guest,
-                                          &conn->uid, &conn->gid, user,
-                                          &conn->nt_user_token);
+               status2 = find_forced_user(conn,
+                               (vuser != NULL) && vuser->guest,
+                               user);
                if (!NT_STATUS_IS_OK(status2)) {
                        conn_free(conn);
                        *status = status2;
@@ -871,22 +892,38 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                                           sid_string_static(sid)));
                                continue;
                        }
-                       add_gid_to_array_unique(NULL, gid, &conn->groups,
-                                               &conn->ngroups);
+                       if (!add_gid_to_array_unique(conn->mem_ctx, gid, &conn->groups,
+                                               &conn->ngroups)) {
+                               DEBUG(0, ("add_gid_to_array_unique failed\n"));
+                               conn_free(conn);
+                               *status = NT_STATUS_NO_MEMORY;
+                               return NULL;
+                       }
                }
        }
 
        {
-               pstring s;
-               pstrcpy(s,lp_pathname(snum));
-               standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
-                                     conn->connectpath, conn->gid,
-                                     get_current_username(),
-                                     current_user_info.domain,
-                                     s, sizeof(s));
-               set_conn_connectpath(conn,s);
+               char *s = talloc_sub_advanced(talloc_tos(),
+                                       lp_servicename(SNUM(conn)), conn->user,
+                                       conn->connectpath, conn->gid,
+                                       get_current_username(),
+                                       current_user_info.domain,
+                                       lp_pathname(snum));
+               if (!s) {
+                       conn_free(conn);
+                       *status = NT_STATUS_NO_MEMORY;
+                       return NULL;
+               }
+
+               if (!set_conn_connectpath(conn,s)) {
+                       TALLOC_FREE(s);
+                       conn_free(conn);
+                       *status = NT_STATUS_NO_MEMORY;
+                       return NULL;
+               }
                DEBUG(3,("Connect path is '%s' for service [%s]\n",s,
                         lp_servicename(snum)));
+               TALLOC_FREE(s);
        }
 
        /*
@@ -897,10 +934,28 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
         */
 
        {
+               bool can_write = False;
                NT_USER_TOKEN *token = conn->nt_user_token ?
-                       conn->nt_user_token : vuser->nt_user_token;
+                       conn->nt_user_token :
+                       (vuser ? vuser->nt_user_token : NULL);
+
+               /*
+                * I don't believe this can happen. But the
+                * logic above is convoluted enough to confuse
+                * automated checkers, so be sure. JRA.
+                */
+
+               if (token == NULL) {
+                       DEBUG(0,("make_connection: connection to %s "
+                                "denied due to missing "
+                                "NT token.\n",
+                                 lp_servicename(snum)));
+                       conn_free(conn);
+                       *status = NT_STATUS_ACCESS_DENIED;
+                       return NULL;
+               }
 
-               BOOL can_write = share_access_check(token,
+               can_write = share_access_check(token,
                                                    lp_servicename(snum),
                                                    FILE_WRITE_DATA);
 
@@ -939,37 +994,63 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
         * depend on the realpath() pointer in the vfs table. JRA.
         */
        if (!lp_widelinks(snum)) {
-               pstring s;
-               pstrcpy(s,conn->connectpath);
-               canonicalize_path(conn, s);
-               set_conn_connectpath(conn,s);
+               if (!canonicalize_connect_path(conn)) {
+                       DEBUG(0, ("canonicalize_connect_path failed "
+                       "for service %s, path %s\n",
+                               lp_servicename(snum),
+                               conn->connectpath));
+                       conn_free(conn);
+                       *status = NT_STATUS_BAD_NETWORK_NAME;
+                       return NULL;
+               }
+       }
+
+       if ((!conn->printer) && (!conn->ipc)) {
+               conn->notify_ctx = notify_init(conn->mem_ctx, server_id_self(),
+                                              smbd_messaging_context(),
+                                              smbd_event_context(),
+                                              conn);
        }
 
 /* ROOT Activities: */ 
-       /* check number of connections */
-       if (!claim_connection(conn,
-                             lp_servicename(snum),
-                             lp_max_connections(snum),
-                             False,0)) {
-               DEBUG(1,("too many connections - rejected\n"));
+       /*
+        * Enforce the max connections parameter.
+        */
+
+       if ((lp_max_connections(snum) > 0)
+           && (count_current_connections(lp_servicename(SNUM(conn)), True) >=
+               lp_max_connections(snum))) {
+
+               DEBUG(1, ("Max connections (%d) exceeded for %s\n",
+                         lp_max_connections(snum), lp_servicename(snum)));
                conn_free(conn);
                *status = NT_STATUS_INSUFFICIENT_RESOURCES;
                return NULL;
        }  
 
+       /*
+        * Get us an entry in the connections db
+        */
+       if (!claim_connection(conn, lp_servicename(snum), 0)) {
+               DEBUG(1, ("Could not store connections entry\n"));
+               conn_free(conn);
+               *status = NT_STATUS_INTERNAL_DB_ERROR;
+               return NULL;
+       }  
+
        /* Preexecs are done here as they might make the dir we are to ChDir
         * to below */
        /* execute any "root preexec = " line */
        if (*lp_rootpreexec(snum)) {
-               pstring cmd;
-               pstrcpy(cmd,lp_rootpreexec(snum));
-               standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
-                                     conn->connectpath, conn->gid,
-                                     get_current_username(),
-                                     current_user_info.domain,
-                                     cmd, sizeof(cmd));
+               char *cmd = talloc_sub_advanced(talloc_tos(),
+                                       lp_servicename(SNUM(conn)), conn->user,
+                                       conn->connectpath, conn->gid,
+                                       get_current_username(),
+                                       current_user_info.domain,
+                                       lp_rootpreexec(snum));
                DEBUG(5,("cmd=%s\n",cmd));
                ret = smbrun(cmd,NULL);
+               TALLOC_FREE(cmd);
                if (ret != 0 && lp_rootpreexec_close(snum)) {
                        DEBUG(1,("root preexec gave %d - failing "
                                 "connection\n", ret));
@@ -998,22 +1079,19 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
 
        /* execute any "preexec = " line */
        if (*lp_preexec(snum)) {
-               pstring cmd;
-               pstrcpy(cmd,lp_preexec(snum));
-               standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
-                                     conn->connectpath, conn->gid,
-                                     get_current_username(),
-                                     current_user_info.domain,
-                                     cmd, sizeof(cmd));
+               char *cmd = talloc_sub_advanced(talloc_tos(),
+                                       lp_servicename(SNUM(conn)), conn->user,
+                                       conn->connectpath, conn->gid,
+                                       get_current_username(),
+                                       current_user_info.domain,
+                                       lp_preexec(snum));
                ret = smbrun(cmd,NULL);
+               TALLOC_FREE(cmd);
                if (ret != 0 && lp_preexec_close(snum)) {
                        DEBUG(1,("preexec gave %d - failing connection\n",
                                 ret));
-                       change_to_root_user();
-                       yield_connection(conn, lp_servicename(snum));
-                       conn_free(conn);
                        *status = NT_STATUS_ACCESS_DENIED;
-                       return NULL;
+                       goto err_root_exit;
                }
        }
 
@@ -1036,13 +1114,13 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
 
        if (SMB_VFS_CONNECT(conn, lp_servicename(snum), user) < 0) {
                DEBUG(0,("make_connection: VFS make connection failed!\n"));
-               change_to_root_user();
-               yield_connection(conn, lp_servicename(snum));
-               conn_free(conn);
                *status = NT_STATUS_UNSUCCESSFUL;
-               return NULL;
+               goto err_root_exit;
        }
 
+       /* Any error exit after here needs to call the disconnect hook. */
+       on_err_call_dis_hook = true;
+
        /* win2000 does not check the permissions on the directory
           during the tree connect, instead relying on permission
           check during individual operations. To match this behaviour
@@ -1060,28 +1138,32 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                                 conn->connectpath, lp_servicename(snum),
                                 strerror(errno) ));
                }
-               change_to_root_user();
-               /* Call VFS disconnect hook */    
-               SMB_VFS_DISCONNECT(conn);
-               yield_connection(conn, lp_servicename(snum));
-               conn_free(conn);
                *status = NT_STATUS_BAD_NETWORK_NAME;
-               return NULL;
+               goto err_root_exit;
        }
-       
+
        string_set(&conn->origpath,conn->connectpath);
-       
+
 #if SOFTLINK_OPTIMISATION
        /* resolve any soft links early if possible */
        if (vfs_ChDir(conn,conn->connectpath) == 0) {
-               pstring s;
-               pstrcpy(s,conn->connectpath);
-               vfs_GetWd(conn,s);
-               set_conn_connectpath(conn,s);
+               TALLOC_CTX *ctx = talloc_stackframe();
+               char *s = vfs_GetWd(ctx,s);
+               if (!s) {
+                       *status = map_nt_error_from_unix(errno);
+                       TALLOC_FREE(ctx);
+                       goto err_root_exit;
+               }
+               if (!set_conn_connectpath(conn,s)) {
+                       *status = NT_STATUS_NO_MEMORY;
+                       TALLOC_FREE(ctx);
+                       goto err_root_exit;
+               }
                vfs_ChDir(conn,conn->connectpath);
+               TALLOC_FREE(ctx);
        }
 #endif
-       
+
        /*
         * Print out the 'connected as' stuff here as we need
         * to know the effective uid and gid we will be using
@@ -1097,13 +1179,21 @@ static connection_struct *make_connection_snum(int snum, user_struct *vuser,
                dbgtext( "(uid=%d, gid=%d) ", (int)geteuid(), (int)getegid() );
                dbgtext( "(pid %d)\n", (int)sys_getpid() );
        }
-       
-       /* Setup the minimum value for a change notify wait time (seconds). */
-       set_change_notify_timeout(lp_change_notify_timeout(snum));
 
        /* we've finished with the user stuff - go back to root */
        change_to_root_user();
        return(conn);
+
+  err_root_exit:
+
+       change_to_root_user();
+       if (on_err_call_dis_hook) {
+               /* Call VFS disconnect hook */
+               SMB_VFS_DISCONNECT(conn);
+       }
+       yield_connection(conn, lp_servicename(snum));
+       conn_free(conn);
+       return NULL;
 }
 
 /***************************************************************************************
@@ -1153,6 +1243,7 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password,
        fstring service;
        fstring dev;
        int snum = -1;
+       char addr[INET6_ADDRSTRLEN];
 
        fstrcpy(dev, pdev);
 
@@ -1190,7 +1281,7 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password,
 
        if (strequal(service_in,HOMES_NAME)) {
                if(lp_security() != SEC_SHARE) {
-                       DATA_BLOB no_pw = data_blob(NULL, 0);
+                       DATA_BLOB no_pw = data_blob_null;
                        if (vuser->homes_snum == -1) {
                                DEBUG(2, ("[homes] share not available for "
                                          "this user because it was not found "
@@ -1226,7 +1317,7 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password,
        } else if ((lp_security() != SEC_SHARE) && (vuser->homes_snum != -1)
                   && strequal(service_in,
                               lp_servicename(vuser->homes_snum))) {
-               DATA_BLOB no_pw = data_blob(NULL, 0);
+               DATA_BLOB no_pw = data_blob_null;
                DEBUG(5, ("making a connection to 'homes' service [%s] "
                          "created at session setup time\n", service_in));
                return make_connection_snum(vuser->homes_snum,
@@ -1249,7 +1340,9 @@ connection_struct *make_connection(const char *service_in, DATA_BLOB password,
                }
 
                DEBUG(0,("%s (%s) couldn't find service %s\n",
-                        get_remote_machine_name(), client_addr(), service));
+                       get_remote_machine_name(),
+                       client_addr(get_client_fd(),addr,sizeof(addr)),
+                       service));
                *status = NT_STATUS_BAD_NETWORK_NAME;
                return NULL;
        }
@@ -1301,28 +1394,28 @@ void close_cnum(connection_struct *conn, uint16 vuid)
        /* execute any "postexec = " line */
        if (*lp_postexec(SNUM(conn)) && 
            change_to_user(conn, vuid))  {
-               pstring cmd;
-               pstrcpy(cmd,lp_postexec(SNUM(conn)));
-               standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
-                                     conn->connectpath, conn->gid,
-                                     get_current_username(),
-                                     current_user_info.domain,
-                                     cmd, sizeof(cmd));
+               char *cmd = talloc_sub_advanced(talloc_tos(),
+                                       lp_servicename(SNUM(conn)), conn->user,
+                                       conn->connectpath, conn->gid,
+                                       get_current_username(),
+                                       current_user_info.domain,
+                                       lp_postexec(SNUM(conn)));
                smbrun(cmd,NULL);
+               TALLOC_FREE(cmd);
                change_to_root_user();
        }
 
        change_to_root_user();
        /* execute any "root postexec = " line */
        if (*lp_rootpostexec(SNUM(conn)))  {
-               pstring cmd;
-               pstrcpy(cmd,lp_rootpostexec(SNUM(conn)));
-               standard_sub_advanced(lp_servicename(SNUM(conn)), conn->user,
-                                     conn->connectpath, conn->gid,
-                                     get_current_username(),
-                                     current_user_info.domain,
-                                     cmd, sizeof(cmd));
+               char *cmd = talloc_sub_advanced(talloc_tos(),
+                                       lp_servicename(SNUM(conn)), conn->user,
+                                       conn->connectpath, conn->gid,
+                                       get_current_username(),
+                                       current_user_info.domain,
+                                       lp_rootpostexec(SNUM(conn)));
                smbrun(cmd,NULL);
+               TALLOC_FREE(cmd);
        }
 
        conn_free(conn);