Changeset 740 for vendor/current/source3/smbd/sesssetup.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source3/smbd/sesssetup.c (modified) (44 diffs)

vendor/current/source3/smbd/sesssetup.c

@@ -24 +24 @@
 
 #include "includes.h"
+#include "../lib/tsocket/tsocket.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/auth/spnego.h"
+#include "../libcli/auth/ntlmssp.h"
+#include "ntlmssp_wrap.h"
+#include "../librpc/gen_ndr/krb5pac.h"
+#include "libads/kerberos_proto.h"
+#include "../lib/util/asn1.h"
+#include "auth.h"
+#include "messages.h"
+#include "smbprofile.h"
 
 /* For split krb5 SPNEGO blobs. */
@@ -40 +50 @@
   is set approriately
 */
-static NTSTATUS do_map_to_guest(NTSTATUS status,
-                                auth_serversupplied_info **server_info,
-                                const char *user, const char *domain)
+NTSTATUS do_map_to_guest(NTSTATUS status,
+                        struct auth_serversupplied_info **server_info,
+                        const char *user, const char *domain)
 {
+        user = user ? user : "";
+        domain = domain ? domain : "";
+
         if (NT_STATUS_EQUAL(status, NT_STATUS_NO_SUCH_USER)) {
                 if ((lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_USER) ||
@@ -128 +141 @@
 ****************************************************************************/
 
-static NTSTATUS check_guest_password(auth_serversupplied_info **server_info)
+static NTSTATUS check_guest_password(struct auth_serversupplied_info **server_info)
 {
         struct auth_context *auth_context;
-        auth_usersupplied_info *user_info = NULL;
+        struct auth_usersupplied_info *user_info = NULL;
 
         NTSTATUS nt_status;
-        unsigned char chal[8];
-
-        ZERO_STRUCT(chal);
+        static unsigned char chal[8] = { 0, };
 
         DEBUG(3,("Got anonymous request\n"));
 
-        if (!NT_STATUS_IS_OK(nt_status = make_auth_context_fixed(&auth_context,
-                                        chal))) {
+        nt_status = make_auth_context_fixed(talloc_tos(), &auth_context, chal);
+        if (!NT_STATUS_IS_OK(nt_status)) {
                 return nt_status;
         }
 
         if (!make_user_info_guest(&user_info)) {
-                (auth_context->free)(&auth_context);
+                TALLOC_FREE(auth_context);
                 return NT_STATUS_NO_MEMORY;
         }
@@ -153 +164 @@
                                                 user_info,
                                                 server_info);
-        (auth_context->free)(&auth_context);
+        TALLOC_FREE(auth_context);
         free_user_info(&user_info);
         return nt_status;
@@ -236 +247 @@
         TALLOC_CTX *mem_ctx;
         DATA_BLOB ticket;
-        char *client, *p, *domain;
-        fstring netbios_domain_name;
         struct passwd *pw;
-        fstring user;
         int sess_vuid = req->vuid;
         NTSTATUS ret = NT_STATUS_OK;
-        struct PAC_DATA *pac_data = NULL;
         DATA_BLOB ap_rep, ap_rep_wrapped, response;
-        auth_serversupplied_info *server_info = NULL;
+        struct auth_serversupplied_info *server_info = NULL;
         DATA_BLOB session_key = data_blob_null;
         uint8 tok_id[2];
         DATA_BLOB nullblob = data_blob_null;
-        fstring real_username;
         bool map_domainuser_to_guest = False;
         bool username_was_mapped;
         struct PAC_LOGON_INFO *logon_info = NULL;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct smbd_server_connection *sconn = req->sconn;
+        char *principal;
+        char *user;
+        char *domain;
+        char *real_username;
 
         ZERO_STRUCT(ticket);
@@ -268 +278 @@
         }
 
-        if (!spnego_parse_krb5_wrap(*secblob, &ticket, tok_id)) {
+        if (!spnego_parse_krb5_wrap(mem_ctx, *secblob, &ticket, tok_id)) {
                 talloc_destroy(mem_ctx);
                 reply_nterror(req, nt_status_squash(NT_STATUS_LOGON_FAILURE));
@@ -275 +285 @@
 
         ret = ads_verify_ticket(mem_ctx, lp_realm(), 0, &ticket,
-                                &client, &pac_data, &ap_rep,
+                                &principal, &logon_info, &ap_rep,
                                 &session_key, True);
 
@@ -336 +346 @@
         }
 
-        DEBUG(3,("Ticket name is [%s]\n", client));
-
-        p = strchr_m(client, '@');
-        if (!p) {
-                DEBUG(3,("Doesn't look like a valid principal\n"));
+        ret = get_user_from_kerberos_info(talloc_tos(),
+                                          sconn->client_id.name,
+                                          principal, logon_info,
+                                          &username_was_mapped,
+                                          &map_domainuser_to_guest,
+                                          &user, &domain,
+                                          &real_username, &pw);
+        if (!NT_STATUS_IS_OK(ret)) {
                 data_blob_free(&ap_rep);
                 data_blob_free(&session_key);
@@ -348 +361 @@
         }
 
-        *p = 0;
-
         /* save the PAC data if we have it */
-
-        if (pac_data) {
-                logon_info = get_logon_info_from_pac(pac_data);
-                if (logon_info) {
-                        netsamlogon_cache_store( client, &logon_info->info3 );
-                }
-        }
-
-        if (!strequal(p+1, lp_realm())) {
-                DEBUG(3,("Ticket for foreign realm %s@%s\n", client, p+1));
-                if (!lp_allow_trusted_domains()) {
-                        data_blob_free(&ap_rep);
-                        data_blob_free(&session_key);
-                        talloc_destroy(mem_ctx);
-                        reply_nterror(req, nt_status_squash(
-                                              NT_STATUS_LOGON_FAILURE));
-                        return;
-                }
-        }
-
-        /* this gives a fully qualified user name (ie. with full realm).
-           that leads to very long usernames, but what else can we do? */
-
-        domain = p+1;
-
-        if (logon_info && logon_info->info3.base.domain.string) {
-                fstrcpy(netbios_domain_name,
-                        logon_info->info3.base.domain.string);
-                domain = netbios_domain_name;
-                DEBUG(10, ("Mapped to [%s] (using PAC)\n", domain));
-
-        } else {
-
-                /* If we have winbind running, we can (and must) shorten the
-                   username by using the short netbios name. Otherwise we will
-                   have inconsistent user names. With Kerberos, we get the
-                   fully qualified realm, with ntlmssp we get the short
-                   name. And even w2k3 does use ntlmssp if you for example
-                   connect to an ip address. */
-
-                wbcErr wbc_status;
-                struct wbcDomainInfo *info = NULL;
-
-                DEBUG(10, ("Mapping [%s] to short name\n", domain));
-
-                wbc_status = wbcDomainInfo(domain, &info);
-
-                if (WBC_ERROR_IS_OK(wbc_status)) {
-
-                        fstrcpy(netbios_domain_name,
-                                info->short_name);
-
-                        wbcFreeMemory(info);
-                        domain = netbios_domain_name;
-                        DEBUG(10, ("Mapped to [%s] (using Winbind)\n", domain));
-                } else {
-                        DEBUG(3, ("Could not find short name: %s\n",
-                                wbcErrorString(wbc_status)));
-                }
-        }
-
-        fstr_sprintf(user, "%s%c%s", domain, *lp_winbind_separator(), client);
-
-        /* lookup the passwd struct, create a new user if necessary */
-
-        username_was_mapped = map_username(sconn, user);
-
-        pw = smb_getpwnam( mem_ctx, user, real_username, True );
-
-        if (pw) {
-                /* if a real user check pam account restrictions */
-                /* only really perfomed if "obey pam restriction" is true */
-                /* do this before an eventual mapping to guest occurs */
-                ret = smb_pam_accountcheck(pw->pw_name);
-                if (  !NT_STATUS_IS_OK(ret)) {
-                        DEBUG(1,("PAM account restriction "
-                                "prevents user login\n"));
-                        data_blob_free(&ap_rep);
-                        data_blob_free(&session_key);
-                        TALLOC_FREE(mem_ctx);
-                        reply_nterror(req, nt_status_squash(ret));
-                        return;
-                }
-        }
-
-        if (!pw) {
-
-                /* this was originally the behavior of Samba 2.2, if a user
-                   did not have a local uid but has been authenticated, then
-                   map them to a guest account */
-
-                if (lp_map_to_guest() == MAP_TO_GUEST_ON_BAD_UID){
-                        map_domainuser_to_guest = True;
-                        fstrcpy(user,lp_guestaccount());
-                        pw = smb_getpwnam( mem_ctx, user, real_username, True );
-                }
-
-                /* extra sanity check that the guest account is valid */
-
-                if ( !pw ) {
-                        DEBUG(1,("Username %s is invalid on this system\n",
-                                user));
-                        data_blob_free(&ap_rep);
-                        data_blob_free(&session_key);
-                        TALLOC_FREE(mem_ctx);
-                        reply_nterror(req, nt_status_squash(
-                                              NT_STATUS_LOGON_FAILURE));
-                        return;
-                }
+        if (logon_info) {
+                netsamlogon_cache_store(user, &logon_info->info3);
         }
 
         /* setup the string used by %U */
-
-        sub_set_smb_name( real_username );
-        reload_services(True);
-
-        if ( map_domainuser_to_guest ) {
-                make_server_info_guest(NULL, &server_info);
-        } else if (logon_info) {
-                /* pass the unmapped username here since map_username()
-                   will be called again from inside make_server_info_info3() */
-
-                ret = make_server_info_info3(mem_ctx, client, domain,
-                                             &server_info, &logon_info->info3);
-                if ( !NT_STATUS_IS_OK(ret) ) {
-                        DEBUG(1,("make_server_info_info3 failed: %s!\n",
-                                 nt_errstr(ret)));
-                        data_blob_free(&ap_rep);
-                        data_blob_free(&session_key);
-                        TALLOC_FREE(mem_ctx);
-                        reply_nterror(req, nt_status_squash(ret));
-                        return;
-                }
-
-        } else {
-                /*
-                 * We didn't get a PAC, we have to make up the user
-                 * ourselves. Try to ask the pdb backend to provide
-                 * SID consistency with ntlmssp session setup
-                 */
-                struct samu *sampass;
-
-                sampass = samu_new(talloc_tos());
-                if (sampass == NULL) {
-                        ret = NT_STATUS_NO_MEMORY;
-                        data_blob_free(&ap_rep);
-                        data_blob_free(&session_key);
-                        TALLOC_FREE(mem_ctx);
-                        reply_nterror(req, nt_status_squash(ret));
-                        return;
-                }
-
-                if (pdb_getsampwnam(sampass, real_username)) {
-                        DEBUG(10, ("found user %s in passdb, calling "
-                                   "make_server_info_sam\n", real_username));
-                        ret = make_server_info_sam(&server_info, sampass);
-                } else {
-                        /*
-                         * User not in passdb, make it up artificially
-                         */
-                        TALLOC_FREE(sampass);
-                        DEBUG(10, ("didn't find user %s in passdb, calling "
-                                   "make_server_info_pw\n", real_username));
-                        ret = make_server_info_pw(&server_info, real_username,
-                                                  pw);
-                }
-
-                if ( !NT_STATUS_IS_OK(ret) ) {
-                        DEBUG(1,("make_server_info_[sam|pw] failed: %s!\n",
-                                 nt_errstr(ret)));
-                        data_blob_free(&ap_rep);
-                        data_blob_free(&session_key);
-                        TALLOC_FREE(mem_ctx);
-                        reply_nterror(req, nt_status_squash(ret));
-                        return;
-                }
-
-                /* make_server_info_pw does not set the domain. Without this
-                 * we end up with the local netbios name in substitutions for
-                 * %D. */
-
-                if (server_info->sam_account != NULL) {
-                        pdb_set_domain(server_info->sam_account,
-                                        domain, PDB_SET);
-                }
+        sub_set_smb_name(real_username);
+
+        /* reload services so that the new %U is taken into account */
+        reload_services(sconn->msg_ctx, sconn->sock, True);
+
+        ret = make_server_info_krb5(mem_ctx,
+                                    user, domain, real_username, pw,
+                                    logon_info, map_domainuser_to_guest,
+                                    &server_info);
+        if (!NT_STATUS_IS_OK(ret)) {
+                DEBUG(1, ("make_server_info_krb5 failed!\n"));
+                data_blob_free(&ap_rep);
+                data_blob_free(&session_key);
+                TALLOC_FREE(mem_ctx);
+                reply_nterror(req, nt_status_squash(ret));
+                return;
         }
 
@@ -543 +390 @@
            already does this */
 
-        if ( !server_info->ptok ) {
+        if ( !server_info->security_token ) {
                 ret = create_local_token( server_info );
                 if ( !NT_STATUS_IS_OK(ret) ) {
@@ -562 +409 @@
 
         data_blob_free(&server_info->user_session_key);
+        /* Set the kerberos-derived session key onto the server_info */
         server_info->user_session_key = session_key;
+        talloc_steal(server_info, session_key.data);
+
         session_key = data_blob_null;
 
@@ -570 +420 @@
          * it.... */
 
-        sess_vuid = register_existing_vuid(sconn,
-                                        sess_vuid,
-                                        server_info,
-                                        nullblob,
-                                        client);
+        sess_vuid = register_existing_vuid(sconn, sess_vuid,
+                                           server_info, nullblob, user);
 
         reply_outbuf(req, 4, 0);
@@ -583 +430 @@
         } else {
                 /* current_user_info is changed on new vuid */
-                reload_services( True );
+                reload_services(sconn->msg_ctx, sconn->sock, True);
 
                 SSVAL(req->outbuf, smb_vwv3, 0);
@@ -599 +446 @@
         /* wrap that up in a nice GSS-API wrapping */
         if (NT_STATUS_IS_OK(ret)) {
-                ap_rep_wrapped = spnego_gen_krb5_wrap(ap_rep,
+                ap_rep_wrapped = spnego_gen_krb5_wrap(talloc_tos(), ap_rep,
                                 TOK_ID_KRB_AP_REP);
         } else {
                 ap_rep_wrapped = data_blob_null;
         }
-        response = spnego_gen_auth_response(&ap_rep_wrapped, ret,
+        response = spnego_gen_auth_response(talloc_tos(), &ap_rep_wrapped, ret,
                         mechOID);
         reply_sesssetup_blob(req, response, ret);
@@ -626 +473 @@
 static void reply_spnego_ntlmssp(struct smb_request *req,
                                  uint16 vuid,
-                                 AUTH_NTLMSSP_STATE **auth_ntlmssp_state,
+                                 struct auth_ntlmssp_state **auth_ntlmssp_state,
                                  DATA_BLOB *ntlmssp_blob, NTSTATUS nt_status,
                                  const char *OID,
                                  bool wrap)
 {
+        bool do_invalidate = true;
         DATA_BLOB response;
-        struct auth_serversupplied_info *server_info = NULL;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct auth_serversupplied_info *session_info = NULL;
+        struct smbd_server_connection *sconn = req->sconn;
 
         if (NT_STATUS_IS_OK(nt_status)) {
-                server_info = (*auth_ntlmssp_state)->server_info;
+                nt_status = auth_ntlmssp_steal_session_info(talloc_tos(),
+                                        (*auth_ntlmssp_state), &session_info);
         } else {
+                /* Note that this session_info won't have a session
+                 * key.  But for map to guest, that's exactly the right
+                 * thing - we can't reasonably guess the key the
+                 * client wants, as the password was wrong */
                 nt_status = do_map_to_guest(nt_status,
-                            &server_info,
-                            (*auth_ntlmssp_state)->ntlmssp_state->user,
-                            (*auth_ntlmssp_state)->ntlmssp_state->domain);
+                                            &session_info,
+                                            auth_ntlmssp_get_username(*auth_ntlmssp_state),
+                                            auth_ntlmssp_get_domain(*auth_ntlmssp_state));
         }
 
@@ -656 +509 @@
                 }
 
-                data_blob_free(&server_info->user_session_key);
-                server_info->user_session_key =
-                        data_blob_talloc(
-                        server_info,
-                        (*auth_ntlmssp_state)->ntlmssp_state->session_key.data,
-                        (*auth_ntlmssp_state)->ntlmssp_state->session_key.length);
-
                 /* register_existing_vuid keeps the server info */
                 if (register_existing_vuid(sconn, vuid,
-                                server_info, nullblob,
-                                (*auth_ntlmssp_state)->ntlmssp_state->user) !=
-                                        vuid) {
+                                           session_info, nullblob,
+                                           auth_ntlmssp_get_username(*auth_ntlmssp_state)) !=
+                                           vuid) {
+                        /* The problem is, *auth_ntlmssp_state points
+                         * into the vuser this will have
+                         * talloc_free()'ed in
+                         * register_existing_vuid() */
+                        do_invalidate = false;
                         nt_status = NT_STATUS_LOGON_FAILURE;
                         goto out;
                 }
 
-                (*auth_ntlmssp_state)->server_info = NULL;
-
                 /* current_user_info is changed on new vuid */
-                reload_services( True );
+                reload_services(sconn->msg_ctx, sconn->sock, True);
 
                 SSVAL(req->outbuf, smb_vwv3, 0);
 
-                if (server_info->guest) {
+                if (session_info->guest) {
                         SSVAL(req->outbuf,smb_vwv2,1);
                 }
@@ -687 +536 @@
 
         if (wrap) {
-                response = spnego_gen_auth_response(ntlmssp_blob,
+                response = spnego_gen_auth_response(talloc_tos(),
+                                ntlmssp_blob,
                                 nt_status, OID);
         } else {
@@ -703 +553 @@
         if (!NT_STATUS_EQUAL(nt_status, NT_STATUS_MORE_PROCESSING_REQUIRED)) {
                 /* NB. This is *NOT* an error case. JRA */
-                auth_ntlmssp_end(auth_ntlmssp_state);
-                if (!NT_STATUS_IS_OK(nt_status)) {
-                        /* Kill the intermediate vuid */
-                        invalidate_vuid(sconn, vuid);
+                if (do_invalidate) {
+                        TALLOC_FREE(*auth_ntlmssp_state);
+                        if (!NT_STATUS_IS_OK(nt_status)) {
+                                /* Kill the intermediate vuid */
+                                invalidate_vuid(sconn, vuid);
+                        }
                 }
         }
@@ -715 +567 @@
 ****************************************************************************/
 
-NTSTATUS parse_spnego_mechanisms(DATA_BLOB blob_in,
+NTSTATUS parse_spnego_mechanisms(TALLOC_CTX *ctx,
+                DATA_BLOB blob_in,
                 DATA_BLOB *pblob_out,
                 char **kerb_mechOID)
@@ -726 +579 @@
 
         /* parse out the OIDs and the first sec blob */
-        if (!parse_negTokenTarg(blob_in, OIDs, pblob_out) ||
-                        OIDs[0] == NULL) {
+        if (!spnego_parse_negTokenInit(ctx, blob_in, OIDs, NULL, pblob_out) ||
+                        (OIDs[0] == NULL)) {
                 return NT_STATUS_LOGON_FAILURE;
         }
@@ -744 +597 @@
         if (strcmp(OID_KERBEROS5, OIDs[0]) == 0 ||
             strcmp(OID_KERBEROS5_OLD, OIDs[0]) == 0) {
-                *kerb_mechOID = SMB_STRDUP(OIDs[0]);
+                *kerb_mechOID = talloc_strdup(ctx, OIDs[0]);
                 if (*kerb_mechOID == NULL) {
                         ret = NT_STATUS_NO_MEMORY;
@@ -773 +626 @@
                 "but set to downgrade to NTLMSSP\n"));
 
-        response = spnego_gen_auth_response(NULL,
+        response = spnego_gen_auth_response(talloc_tos(), NULL,
                         NT_STATUS_MORE_PROCESSING_REQUIRED,
                         OID_NTLMSSP);
@@ -787 +640 @@
                                    uint16 vuid,
                                    DATA_BLOB blob1,
-                                   AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
+                                   struct auth_ntlmssp_state **auth_ntlmssp_state)
 {
         DATA_BLOB secblob;
@@ -793 +646 @@
         char *kerb_mech = NULL;
         NTSTATUS status;
-        struct smbd_server_connection *sconn = smbd_server_conn;
-
-        status = parse_spnego_mechanisms(blob1, &secblob, &kerb_mech);
+        struct smbd_server_connection *sconn = req->sconn;
+
+        status = parse_spnego_mechanisms(talloc_tos(),
+                        blob1, &secblob, &kerb_mech);
         if (!NT_STATUS_IS_OK(status)) {
                 /* Kill the intermediate vuid */
@@ -817 +671 @@
                         invalidate_vuid(sconn, vuid);
                 }
-                SAFE_FREE(kerb_mech);
+                TALLOC_FREE(kerb_mech);
                 return;
         }
 #endif
 
-        if (*auth_ntlmssp_state) {
-                auth_ntlmssp_end(auth_ntlmssp_state);
-        }
+        TALLOC_FREE(*auth_ntlmssp_state);
 
         if (kerb_mech) {
@@ -831 +683 @@
                  * we need to fall back to NTLM. */
                 reply_spnego_downgrade_to_ntlmssp(req, vuid);
-                SAFE_FREE(kerb_mech);
+                TALLOC_FREE(kerb_mech);
                 return;
         }
@@ -864 +716 @@
                               uint16 vuid,
                               DATA_BLOB blob1,
-                              AUTH_NTLMSSP_STATE **auth_ntlmssp_state)
+                              struct auth_ntlmssp_state **auth_ntlmssp_state)
 {
         DATA_BLOB auth = data_blob_null;
@@ -870 +722 @@
         DATA_BLOB secblob = data_blob_null;
         NTSTATUS status = NT_STATUS_LOGON_FAILURE;
-        struct smbd_server_connection *sconn = smbd_server_conn;
-
-        if (!spnego_parse_auth(blob1, &auth)) {
+        struct smbd_server_connection *sconn = req->sconn;
+
+        if (!spnego_parse_auth(talloc_tos(), blob1, &auth)) {
 #if 0
                 file_save("auth.dat", blob1.data, blob1.length);
@@ -888 +740 @@
                 char *kerb_mech = NULL;
 
-                status = parse_spnego_mechanisms(auth, &secblob, &kerb_mech);
+                status = parse_spnego_mechanisms(talloc_tos(),
+                                auth, &secblob, &kerb_mech);
 
                 if (!NT_STATUS_IS_OK(status)) {
@@ -911 +764 @@
                                 invalidate_vuid(sconn, vuid);
                         }
-                        SAFE_FREE(kerb_mech);
+                        TALLOC_FREE(kerb_mech);
                         return;
                 }
@@ -927 +780 @@
                         reply_nterror(req, nt_status_squash(
                                         NT_STATUS_LOGON_FAILURE));
-                        SAFE_FREE(kerb_mech);
+                        TALLOC_FREE(kerb_mech);
                 }
         }
@@ -1208 +1061 @@
         NTSTATUS status = NT_STATUS_OK;
         uint16 smbpid = req->smbpid;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct smbd_server_connection *sconn = req->sconn;
 
         DEBUG(3,("Doing spnego session setup\n"));
@@ -1267 +1120 @@
                 } else {
                         ra_lanman_string( native_lanman );
+                }
+        } else if ( ra_type == RA_VISTA ) {
+                if ( strncmp(native_os, "Mac OS X", 8) == 0 ) {
+                        set_remote_arch(RA_OSX);
                 }
         }
@@ -1379 +1236 @@
 ****************************************************************************/
 
-static int shutdown_other_smbds(struct db_record *rec,
-                                const struct connections_key *key,
+struct shutdown_state {
+        const char *ip;
+        struct messaging_context *msg_ctx;
+};
+
+static int shutdown_other_smbds(const struct connections_key *key,
                                 const struct connections_data *crec,
                                 void *private_data)
 {
-        const char *ip = (const char *)private_data;
+        struct shutdown_state *state = (struct shutdown_state *)private_data;
+
+        DEBUG(10, ("shutdown_other_smbds: %s, %s\n",
+                   procid_str(talloc_tos(), &crec->pid), crec->addr));
 
         if (!process_exists(crec->pid)) {
+                DEBUG(10, ("process does not exist\n"));
                 return 0;
         }
 
         if (procid_is_me(&crec->pid)) {
+                DEBUG(10, ("It's me\n"));
                 return 0;
         }
 
-        if (strcmp(ip, crec->addr) != 0) {
+        if (strcmp(state->ip, crec->addr) != 0) {
+                DEBUG(10, ("%s does not match %s\n", state->ip, crec->addr));
                 return 0;
         }
 
-        DEBUG(0,("shutdown_other_smbds: shutting down pid %u "
-                 "(IP %s)\n", (unsigned int)procid_to_pid(&crec->pid), ip));
-
-        messaging_send(smbd_messaging_context(), crec->pid, MSG_SHUTDOWN,
+        DEBUG(1, ("shutdown_other_smbds: shutting down pid %u "
+                  "(IP %s)\n", (unsigned int)procid_to_pid(&crec->pid),
+                  state->ip));
+
+        messaging_send(state->msg_ctx, crec->pid, MSG_SHUTDOWN,
                        &data_blob_null);
         return 0;
 }
 
-static void setup_new_vc_session(void)
+static void setup_new_vc_session(struct smbd_server_connection *sconn)
 {
-        char addr[INET6_ADDRSTRLEN];
-
         DEBUG(2,("setup_new_vc_session: New VC == 0, if NT4.x "
                 "compatible we would close all old resources.\n"));
@@ -1417 +1283 @@
 #endif
         if (lp_reset_on_zero_vc()) {
-                connections_forall(shutdown_other_smbds,
-                        CONST_DISCARD(void *,
-                        client_addr(get_client_fd(),addr,sizeof(addr))));
+                char *addr;
+                struct shutdown_state state;
+
+                addr = tsocket_address_inet_addr_string(
+                        sconn->remote_address, talloc_tos());
+                if (addr == NULL) {
+                        return;
+                }
+                state.ip = addr;
+                state.msg_ctx = sconn->msg_ctx;
+                connections_forall_read(shutdown_other_smbds, &state);
+                TALLOC_FREE(addr);
         }
 }
@@ -1436 +1311 @@
         char *tmp;
         const char *user;
-        fstring sub_user; /* Sainitised username for substituion */
+        fstring sub_user; /* Sanitised username for substituion */
         const char *domain;
         const char *native_os;
         const char *native_lanman;
         const char *primary_domain;
-        auth_usersupplied_info *user_info = NULL;
-        auth_serversupplied_info *server_info = NULL;
+        struct auth_usersupplied_info *user_info = NULL;
+        struct auth_serversupplied_info *server_info = NULL;
         uint16 smb_flag2 = req->flags2;
 
         NTSTATUS nt_status;
-        struct smbd_server_connection *sconn = smbd_server_conn;
+        struct smbd_server_connection *sconn = req->sconn;
 
         bool doencrypt = sconn->smb1.negprot.encrypted_passwords;
@@ -1474 +1349 @@
 
                 if (SVAL(req->vwv+4, 0) == 0) {
-                        setup_new_vc_session();
+                        setup_new_vc_session(req->sconn);
                 }
 
@@ -1671 +1546 @@
 
         if (SVAL(req->vwv+4, 0) == 0) {
-                setup_new_vc_session();
+                setup_new_vc_session(req->sconn);
         }
 
@@ -1698 +1573 @@
         sub_set_smb_name(sub_user);
 
-        reload_services(True);
+        reload_services(sconn->msg_ctx, sconn->sock, True);
 
         if (lp_security() == SEC_SHARE) {
+                char *sub_user_mapped = NULL;
                 /* In share level we should ignore any passwords */
 
@@ -1707 +1583 @@
                 data_blob_clear_free(&plaintext_password);
 
-                map_username(sconn, sub_user);
+                (void)map_username(talloc_tos(), sub_user, &sub_user_mapped);
+                if (!sub_user_mapped) {
+                        reply_nterror(req, NT_STATUS_NO_MEMORY);
+                        END_PROFILE(SMBsesssetupX);
+                        return;
+                }
+                fstrcpy(sub_user, sub_user_mapped);
                 add_session_user(sconn, sub_user);
                 add_session_workgroup(sconn, domain);
@@ -1742 +1624 @@
 
                 nt_status = make_auth_context_subsystem(
-                                &plaintext_auth_context);
+                        talloc_tos(), &plaintext_auth_context);
 
                 if (NT_STATUS_IS_OK(nt_status)) {
@@ -1762 +1644 @@
                                                 &server_info);
 
-                                (plaintext_auth_context->free)(
-                                                &plaintext_auth_context);
+                                TALLOC_FREE(plaintext_auth_context);
                         }
                 }
@@ -1792 +1673 @@
         }
 
-        if (!server_info->ptok) {
+        if (!server_info->security_token) {
                 nt_status = create_local_token(server_info);
 
@@ -1852 +1733 @@
 
                 /* current_user_info is changed on new vuid */
-                reload_services( True );
+                reload_services(sconn->msg_ctx, sconn->sock, True);
         }