r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation

[samba.git] / source3 / smbd / session.c

diff --git a/source3/smbd/session.c b/source3/smbd/session.c
index ac06b9872dd04e513069e39b2dbc1c86a466fc9c..9a9a0d90b24a3a003445e34121cd456fafce41fd 100644 (file)
--- a/source3/smbd/session.c
+++ b/source3/smbd/session.c
@@ -28,6 +28,22 @@
 #include "includes.h"
 
 static TDB_CONTEXT *tdb;
+
+BOOL session_init(void)
+{
+       if (tdb)
+               return True;
+
+       tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
+                      O_RDWR | O_CREAT, 0644);
+       if (!tdb) {
+               DEBUG(1,("session_init: failed to open sessionid tdb\n"));
+               return False;
+       }
+
+       return True;
+}
+
 /* called when a session is created */
 BOOL session_claim(user_struct *vuser)
 {
@@ -52,21 +68,14 @@ BOOL session_claim(user_struct *vuser)
                return True;
        }
 
-       if (!tdb) {
-               tdb = tdb_open_log(lock_path("sessionid.tdb"), 0, TDB_CLEAR_IF_FIRST|TDB_DEFAULT, 
-                              O_RDWR | O_CREAT, 0644);
-               if (!tdb) {
-                       DEBUG(1,("session_claim: failed to open sessionid tdb\n"));
-                       return False;
-               }
-       }
+       if (!session_init())
+               return False;
 
        ZERO_STRUCT(sessionid);
 
        data.dptr = NULL;
        data.dsize = 0;
 
-#if WITH_UTMP
        if (lp_utmp()) {
                for (i=1;i<MAX_SESSION_ID;i++) {
                        slprintf(keystr, sizeof(keystr)-1, "ID/%d", i);
@@ -84,7 +93,6 @@ BOOL session_claim(user_struct *vuser)
                slprintf(sessionid.id_str, sizeof(sessionid.id_str)-1, SESSION_UTMP_TEMPLATE, i);
                tdb_store_flag = TDB_MODIFY;
        } else
-#endif
        {
                slprintf(keystr, sizeof(keystr)-1, "ID/%lu/%u", 
                         (long unsigned int)sys_getpid(), 
@@ -100,7 +108,7 @@ BOOL session_claim(user_struct *vuser)
        }
 
        /* If 'hostname lookup' == yes, then do the DNS lookup.  This is
-           needed becouse utmp and PAM both expect DNS names 
+           needed because utmp and PAM both expect DNS names 
           
           client_name() handles this case internally.
        */
@@ -137,15 +145,13 @@ BOOL session_claim(user_struct *vuser)
                return False;
        }
 
-#if WITH_UTMP  
        if (lp_utmp()) {
                sys_utmp_claim(sessionid.username, sessionid.hostname, 
                               client_ip,
                               sessionid.id_str, sessionid.id_num);
        }
-#endif
 
-       vuser->session_keystr = strdup(keystr);
+       vuser->session_keystr = SMB_STRDUP(keystr);
        if (!vuser->session_keystr) {
                DEBUG(0, ("session_claim:  strdup() failed for session_keystr\n"));
                return False;
@@ -181,13 +187,11 @@ void session_yield(user_struct *vuser)
 
        SAFE_FREE(dbuf.dptr);
 
-#if WITH_UTMP  
        if (lp_utmp()) {
                sys_utmp_yield(sessionid.username, sessionid.hostname, 
                               client_ip,
                               sessionid.id_str, sessionid.id_num);
        }
-#endif
 
        smb_pam_close_session(sessionid.username, sessionid.id_str, sessionid.hostname);
 
@@ -196,7 +200,7 @@ void session_yield(user_struct *vuser)
 
 static BOOL session_traverse(int (*fn)(TDB_CONTEXT *, TDB_DATA, TDB_DATA, void *), void *state)
 {
-       if (!tdb) {
+       if (!session_init()) {
                DEBUG(3, ("No tdb opened\n"));
                return False;
        }
@@ -217,8 +221,8 @@ static int gather_sessioninfo(TDB_CONTEXT *stdb, TDB_DATA kbuf, TDB_DATA dbuf,
        const struct sessionid *current = (const struct sessionid *) dbuf.dptr;
 
        sesslist->count += 1;
-       sesslist->sessions = REALLOC(sesslist->sessions, sesslist->count * 
-                                     sizeof(struct sessionid));
+       sesslist->sessions = SMB_REALLOC_ARRAY(sesslist->sessions, struct sessionid,
+                                       sesslist->count);
 
        memcpy(&sesslist->sessions[sesslist->count - 1], current, 
               sizeof(struct sessionid));
@@ -244,4 +248,3 @@ int list_sessions(struct sessionid **session_list)
        *session_list = sesslist.sessions;
        return sesslist.count;
 }
-