BROKEN: TODO smbXsrv_open infra: add "file_name/path_name/share_name = <TODO>" and...

was 55159a5499d4341d601b38d1e03bff7280053343

diff --git a/source3/smbd/smbXsrv_open.c b/source3/smbd/smbXsrv_open.c
index 2a2cf6973e7da28f415737b99677469531d07783..902bcc30fbbef3017cf457fc88794a165c912829 100644 (file)
--- a/source3/smbd/smbXsrv_open.c
+++ b/source3/smbd/smbXsrv_open.c
@@ -877,6 +877,21 @@ NTSTATUS smbXsrv_open_create(struct smbXsrv_connection *conn,
        if (conn->protocol >= PROTOCOL_SMB2_10) {
                global->client_guid = conn->smb2.client.guid;
        }
+       global->file_name = talloc_strdup(global, "<TODO>");
+       if (global->file_name == NULL) {
+               TALLOC_FREE(op);
+               return NT_STATUS_NO_MEMORY;
+       }
+       global->path_name = talloc_strdup(global, "<TODO>");
+       if (global->path_name == NULL) {
+               TALLOC_FREE(op);
+               return NT_STATUS_NO_MEMORY;
+       }
+       global->share_name = talloc_strdup(global, "<TODO>");
+       if (global->share_name == NULL) {
+               TALLOC_FREE(op);
+               return NT_STATUS_NO_MEMORY;
+       }
 
        ptr = op;
        val = make_tdb_data((uint8_t const *)&ptr, sizeof(ptr));
@@ -1093,6 +1108,15 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
                                        op->global->open_global_id,
                                        op->global /* TALLOC_CTX */);
                if (global_rec == NULL) {
+<<<<<<< HEAD
+=======
+                       DEBUG(0, ("smbXsrv_open_close(0x%08x, '%s'): "
+                                 "Failed to lock global key '%s'\n",
+                                 op->global->open_global_id,
+                                 op->global->file_name,
+                                 hex_encode_talloc(global_rec, key.dptr,
+                                                   key.dsize)));
+>>>>>>> 55159a5499d4... TODO smbXsrv_open infra: add "file_name/path_name/share_name = <TODO>" and DEBUG
                        error = NT_STATUS_INTERNAL_ERROR;
                }
        }
@@ -1112,9 +1136,10 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
                        global_rec = NULL;
                }
                if (!NT_STATUS_IS_OK(status)) {
-                       DEBUG(0,("smbXsrv_open_close(0x%08x)"
+                       DEBUG(0,("smbXsrv_open_close(0x%08x, '%s')"
                                 "smbXsrv_open_global_store() failed - %s\n",
                                 op->global->open_global_id,
+                                op->global->file_name,
                                 nt_errstr(status)));
                        error = status;
                }
@@ -1126,9 +1151,10 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
                        open_blob.version = SMBXSRV_VERSION_0;
                        open_blob.info.info0 = op;
 
-                       DEBUG(10,("smbXsrv_open_close(0x%08x): "
+                       DEBUG(10,("smbXsrv_open_close(0x%08x, '%s'): "
                                  "stored disconnect\n",
-                                 op->global->open_global_id));
+                                 op->global->open_global_id,
+                                 op->global->file_name));
                        NDR_PRINT_DEBUG(smbXsrv_openB, &open_blob);
                }
        }
@@ -1138,9 +1164,10 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
                if (!NT_STATUS_IS_OK(status)) {
                        TDB_DATA key = dbwrap_record_get_key(global_rec);
 
-                       DEBUG(0, ("smbXsrv_open_close(0x%08x): "
+                       DEBUG(0, ("smbXsrv_open_close(0x%08x, '%s'): "
                                  "failed to delete global key '%s': %s\n",
                                  op->global->open_global_id,
+                                 op->global->file_name,
                                  hex_encode_talloc(global_rec, key.dptr,
                                                    key.dsize),
                                  nt_errstr(status)));
@@ -1155,6 +1182,15 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
                                                            op->local_id,
                                                            op /* TALLOC_CTX*/);
                if (local_rec == NULL) {
+<<<<<<< HEAD
+=======
+                       DEBUG(0, ("smbXsrv_open_close(0x%08x, '%s'): "
+                                 "Failed to lock local key '%s'\n",
+                                 op->global->open_global_id,
+                                 op->global->file_name,
+                                 hex_encode_talloc(local_rec, key.dptr,
+                                                   key.dsize)));
+>>>>>>> 55159a5499d4... TODO smbXsrv_open infra: add "file_name/path_name/share_name = <TODO>" and DEBUG
                        error = NT_STATUS_INTERNAL_ERROR;
                }
        }
@@ -1164,9 +1200,10 @@ NTSTATUS smbXsrv_open_close(struct smbXsrv_open *op, NTTIME now)
                if (!NT_STATUS_IS_OK(status)) {
                        TDB_DATA key = dbwrap_record_get_key(local_rec);
 
-                       DEBUG(0, ("smbXsrv_open_close(0x%08x): "
+                       DEBUG(0, ("smbXsrv_open_close(0x%08x, '%s'): "
                                  "failed to delete local key '%s': %s\n",
                                  op->global->open_global_id,
+                                 op->global->file_name,
                                  hex_encode_talloc(local_rec, key.dptr,
                                                    key.dsize),
                                  nt_errstr(status)));