Changeset 740 for vendor/current/source3/smbd/session.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/session.c (modified) (12 diffs)

vendor/current/source3/smbd/session.c

@@ -28 +28 @@
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
-
-/********************************************************************
-********************************************************************/
-
-static struct db_context *session_db_ctx(void)
-{
-        if (session_db_ctx_ptr)
-                return session_db_ctx_ptr;
-
-        session_db_ctx_ptr = db_open(NULL, lock_path("sessionid.tdb"), 0,
-                                     TDB_CLEAR_IF_FIRST|TDB_DEFAULT,
-                                     O_RDWR | O_CREAT, 0644);
-        return session_db_ctx_ptr;
-}
-
-bool session_init(void)
-{
-        if (session_db_ctx() == NULL) {
-                DEBUG(1,("session_init: failed to open sessionid tdb\n"));
-                return False;
-        }
-
-        return True;
-}
+#include "dbwrap.h"
+#include "session.h"
+#include "auth.h"
 
 /********************************************************************
@@ -58 +38 @@
 ********************************************************************/
 
-bool session_claim(user_struct *vuser)
-{
-        TDB_DATA key, data;
+bool session_claim(struct smbd_server_connection *sconn, user_struct *vuser)
+{
+        struct server_id pid = sconn_server_id(sconn);
+        TDB_DATA data;
         int i = 0;
         struct sessionid sessionid;
-        struct server_id pid = procid_self();
         fstring keystr;
-        const char * hostname;
-        struct db_context *ctx;
         struct db_record *rec;
         NTSTATUS status;
-        char addr[INET6_ADDRSTRLEN];
 
         vuser->session_keystr = NULL;
@@ -75 +52 @@
         /* don't register sessions for the guest user - its just too
            expensive to go through pam session code for browsing etc */
-        if (vuser->server_info->guest) {
+        if (vuser->session_info->guest) {
                 return True;
         }
 
-        if (!(ctx = session_db_ctx())) {
+        if (!sessionid_init()) {
                 return False;
         }
@@ -99 +76 @@
 
                         snprintf(keystr, sizeof(keystr), "ID/%d", i);
-                        key = string_term_tdb_data(keystr);
-
-                        rec = ctx->fetch_locked(ctx, NULL, key);
-
+
+                        rec = sessionid_fetch_record(NULL, keystr);
                         if (rec == NULL) {
                                 DEBUG(1, ("Could not lock \"%s\"\n", keystr));
@@ -140 +115 @@
                 snprintf(keystr, sizeof(keystr), "ID/%s/%u",
                          procid_str_static(&pid), vuser->vuid);
-                key = string_term_tdb_data(keystr);
-
-                rec = ctx->fetch_locked(ctx, NULL, key);
-
+
+                rec = sessionid_fetch_record(NULL, keystr);
                 if (rec == NULL) {
                         DEBUG(1, ("Could not lock \"%s\"\n", keystr));
@@ -162 +135 @@
         */
 
-        hostname = client_name(get_client_fd());
-        if (strcmp(hostname, "UNKNOWN") == 0) {
-                hostname = client_addr(get_client_fd(),addr,sizeof(addr));
-        }
-
-        fstrcpy(sessionid.username, vuser->server_info->unix_name);
-        fstrcpy(sessionid.hostname, hostname);
+        fstrcpy(sessionid.username, vuser->session_info->unix_name);
+        fstrcpy(sessionid.hostname, sconn->client_id.name);
         sessionid.id_num = i;  /* Only valid for utmp sessions */
         sessionid.pid = pid;
-        sessionid.uid = vuser->server_info->utok.uid;
-        sessionid.gid = vuser->server_info->utok.gid;
+        sessionid.uid = vuser->session_info->utok.uid;
+        sessionid.gid = vuser->session_info->utok.gid;
         fstrcpy(sessionid.remote_machine, get_remote_machine_name());
-        fstrcpy(sessionid.ip_addr_str,
-                client_addr(get_client_fd(),addr,sizeof(addr)));
+        fstrcpy(sessionid.ip_addr_str, sconn->client_id.addr);
         sessionid.connect_start = time(NULL);
 
@@ -220 +187 @@
 void session_yield(user_struct *vuser)
 {
-        TDB_DATA key;
         struct sessionid sessionid;
-        struct db_context *ctx;
         struct db_record *rec;
-
-        if (!(ctx = session_db_ctx())) return;
 
         if (!vuser->session_keystr) {
@@ -231 +194 @@
         }
 
-        key = string_term_tdb_data(vuser->session_keystr);
-
-        if (!(rec = ctx->fetch_locked(ctx, NULL, key))) {
+        rec = sessionid_fetch_record(NULL, vuser->session_keystr);
+        if (rec == NULL) {
                 return;
         }
@@ -254 +216 @@
 
         TALLOC_FREE(rec);
-}
-
-/********************************************************************
-********************************************************************/
-
-static bool session_traverse(int (*fn)(struct db_record *db,
-                                       void *private_data),
-                             void *private_data)
-{
-        struct db_context *ctx;
-
-        if (!(ctx = session_db_ctx())) {
-                DEBUG(3, ("No tdb opened\n"));
-                return False;
-        }
-
-        ctx->traverse_read(ctx, fn, private_data);
-        return True;
 }
 
@@ -283 +227 @@
 };
 
-static int gather_sessioninfo(struct db_record *rec, void *state)
-{
-        struct session_list *sesslist = (struct session_list *) state;
-        const struct sessionid *current =
-                (const struct sessionid *) rec->value.dptr;
+static int gather_sessioninfo(const char *key, struct sessionid *session,
+                              void *private_data)
+{
+        struct session_list *sesslist = (struct session_list *)private_data;
 
         sesslist->sessions = TALLOC_REALLOC_ARRAY(
@@ -298 +241 @@
         }
 
-        memcpy(&sesslist->sessions[sesslist->count], current,
+        memcpy(&sesslist->sessions[sesslist->count], session,
                sizeof(struct sessionid));
 
         sesslist->count++;
 
-        DEBUG(7,("gather_sessioninfo session from %s@%s\n", 
-                 current->username, current->remote_machine));
+        DEBUG(7, ("gather_sessioninfo session from %s@%s\n",
+                  session->username, session->remote_machine));
 
         return 0;
@@ -315 +258 @@
 {
         struct session_list sesslist;
+        int ret;
 
         sesslist.mem_ctx = mem_ctx;
         sesslist.count = 0;
         sesslist.sessions = NULL;
-        
-        if (!session_traverse(gather_sessioninfo, (void *) &sesslist)) {
+
+        ret = sessionid_traverse_read(gather_sessioninfo, (void *) &sesslist);
+        if (ret == -1) {
                 DEBUG(3, ("Session traverse failed\n"));
                 SAFE_FREE(sesslist.sessions);