Revert bogus part of previous patch.

(This used to be commit 3cddfe211da812a533611eecba5d5da55fd3cf2d)

diff --git a/source3/smbd/connection.c b/source3/smbd/connection.c
index ff6974cade1a2dd02526c52dfe0a6944336e6425..5547309a818591d24401bd36889640b9ba8a199d 100644 (file)
--- a/source3/smbd/connection.c
+++ b/source3/smbd/connection.c
@@ -35,12 +35,15 @@ TDB_CONTEXT *conn_tdb_ctx(void)
        return tdb;
 }
 
-static void make_conn_key(connection_struct *conn, const char *name, TDB_DATA *pkbuf, fstring tdb_key)
+static void make_conn_key(connection_struct *conn, const char *name, TDB_DATA *pkbuf, struct connections_key *pkey)
 {
-       snprintf(tdb_key, sizeof(fstring), "CONN/%lu/%ld", sys_getpid(), conn?conn->cnum:-1);
+       ZERO_STRUCTP(pkey);
+       pkey->pid = sys_getpid();
+       pkey->cnum = conn?conn->cnum:-1;
+       fstrcpy(pkey->name, name);
 
-       pkbuf->dptr = tdb_key;
-       pkbuf->dsize = strlen(tdb_key)+1;
+       pkbuf->dptr = (char *)pkey;
+       pkbuf->dsize = sizeof(*pkey);
 }
 
 /****************************************************************************
@@ -49,7 +52,7 @@ static void make_conn_key(connection_struct *conn, const char *name, TDB_DATA *p
 
 BOOL yield_connection(connection_struct *conn, const char *name)
 {
-       fstring tdb_key;
+       struct connections_key key;
        TDB_DATA kbuf;
 
        if (!tdb)
@@ -57,7 +60,7 @@ BOOL yield_connection(connection_struct *conn, const char *name)
 
        DEBUG(3,("Yielding connection to %s\n",name));
 
-       make_conn_key(conn, name, &kbuf, tdb_key);
+       make_conn_key(conn, name, &kbuf, &key);
 
        if (tdb_delete(tdb, kbuf) != 0) {
                int dbg_lvl = (!conn && (tdb_error(tdb) == TDB_ERR_NOEXIST)) ? 3 : 0;