Changeset 745 for trunk/server/source4/smb_server/management.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/smb_server/management.c (modified) (5 diffs)

trunk/server/source4/smb_server/management.c

@@ -26 +26 @@
 #include "librpc/gen_ndr/ndr_irpc.h"
 #include "auth/auth.h"
+#include "lib/tsocket/tsocket.h"
 
 /*
@@ -35 +36 @@
         struct smbsrv_connection *smb_conn = talloc_get_type(msg->private_data,
                                              struct smbsrv_connection);
+        struct tsocket_address *client_addr = smb_conn->connection->remote_address;
+        char *client_addr_string;
         int i=0, count=0;
         struct smbsrv_session *sess;
+
+        /* This is for debugging only! */
+        client_addr_string = tsocket_address_string(client_addr, r);
+        NT_STATUS_HAVE_NO_MEMORY(client_addr_string);
 
         /* count the number of sessions */
@@ -49 +56 @@
         for (sess=smb_conn->sessions.list; sess; sess=sess->next) {
                 struct smbsrv_session_info *info = &r->out.info.sessions.sessions[i];
-                struct socket_address *client_addr;
-                client_addr = socket_get_peer_addr(smb_conn->connection->socket, r);
-                
-                if (client_addr) {
-                        info->client_ip = client_addr->addr;
-                } else {
-                        info->client_ip = NULL;
-                }
+
+                info->client_ip    = client_addr_string;
 
                 info->vuid         = sess->vuid;
-                info->account_name = sess->session_info->server_info->account_name;
-                info->domain_name  = sess->session_info->server_info->domain_name;
+                info->account_name = sess->session_info->info->account_name;
+                info->domain_name  = sess->session_info->info->domain_name;
                 
                 info->connect_time = timeval_to_nttime(&sess->statistics.connect_time);
@@ -79 +80 @@
         struct smbsrv_connection *smb_conn = talloc_get_type(msg->private_data,
                                              struct smbsrv_connection);
+        struct tsocket_address *client_addr = smb_conn->connection->remote_address;
+        char *client_addr_string;
         int i=0, count=0;
         struct smbsrv_tcon *tcon;
+
+        /* This is for debugging only! */
+        client_addr_string = tsocket_address_string(client_addr, r);
+        NT_STATUS_HAVE_NO_MEMORY(client_addr_string);
 
         /* count the number of tcons */
@@ -93 +100 @@
         for (tcon=smb_conn->smb_tcons.list; tcon; tcon=tcon->next) {
                 struct smbsrv_tcon_info *info = &r->out.info.tcons.tcons[i];
-                struct socket_address *client_addr;
-                client_addr = socket_get_peer_addr(smb_conn->connection->socket, r);
-                
-                if (client_addr) {
-                        info->client_ip = client_addr->addr;
-                } else {
-                        info->client_ip = NULL;
-                }
+
+                info->client_ip    = client_addr_string;
 
                 info->tid          = tcon->tid;