← Back to branch summary

~ubuntu-branches/ubuntu/vivid/samba/vivid

« back to all changes in this revision

Viewing changes to source4/smb_server/tcon.c

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2011-12-21 13:18:04 UTC
  • mfrom: (0.39.21 sid)
  • Revision ID: package-import@ubuntu.com-20111221131804-xtlr39wx6njehxxr
Tags: 2:3.6.1-3ubuntu1
* Merge from Debian testing.  Remaining changes:
  + debian/patches/VERSION.patch:
    - set SAMBA_VERSION_SUFFIX to Ubuntu.
  + debian/patches/error-trans.fix-276472:
    - Add the translation of Unix Error code -ENOTSUP to NT Error Code
    - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error.
  + debian/smb.conf:
    - add "(Samba, Ubuntu)" to server string.
    - comment out the default [homes] share, and add a comment about
      "valid users = %S" to show users how to restrict access to
      \\server\username to only username.
    - Set 'usershare allow guests', so that usershare admins are 
      allowed to create public shares in addition to authenticated
      ones.
    - add map to guest = Bad user, maps bad username to guest access.
  + debian/samba-common.config:
    - Do not change priority to high if dhclient3 is installed.
    - Use priority medium instead of high for the workgroup question.
  + debian/control:
    - Don't build against or suggest ctdb.
    - Add dependency on samba-common-bin to samba.
  + Add ufw integration:
    - Created debian/samba.ufw.profile
    - debian/rules, debian/samba.dirs, debian/samba.files: install
      profile
    - debian/control: have samba suggest ufw
  + Add apport hook:
    - Created debian/source_samba.py.
    - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install
  + Switch to upstart:
    - Add debian/samba.{nmbd,smbd}.upstart.
  + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
    - Make them upstart compatible
  + debian/samba.postinst: 
    - Avoid scary pdbedit warnings on first import.
  + debian/samba-common.postinst: Add more informative error message for
    the case where smb.conf was manually deleted
  + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level'
    as a global variable name in an NSS module 
  + Dropped:
    - debian/patches/error-trans.fix-276472
    - debian/patches/fix-debuglevel-name-conflict.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
source4/smb_server/tcon.c
22
22
#include "includes.h"
23
23
#include "smb_server/smb_server.h"
24
24
#include "smbd/service_stream.h"
 
25
#include "lib/tsocket/tsocket.h"
25
26
#include "ntvfs/ntvfs.h"
26
27
 
27
 
struct socket_address *smbsrv_get_my_addr(void *p, TALLOC_CTX *mem_ctx)
28
 
{
29
 
        struct smbsrv_connection *smb_conn = talloc_get_type(p,
30
 
                                             struct smbsrv_connection);
31
 
 
32
 
        return socket_get_my_addr(smb_conn->connection->socket, mem_ctx);
33
 
}
34
 
 
35
 
struct socket_address *smbsrv_get_peer_addr(void *p, TALLOC_CTX *mem_ctx)
36
 
{
37
 
        struct smbsrv_connection *smb_conn = talloc_get_type(p,
38
 
                                             struct smbsrv_connection);
39
 
 
40
 
        return socket_get_peer_addr(smb_conn->connection->socket, mem_ctx);
41
 
}
42
 
 
43
28
/****************************************************************************
44
29
init the tcon structures
45
30
****************************************************************************/
112
97
static int smbsrv_tcon_destructor(struct smbsrv_tcon *tcon)
113
98
{
114
99
        struct smbsrv_tcons_context *tcons_ctx;
115
 
        struct socket_address *client_addr;
116
 
 
117
 
        client_addr = socket_get_peer_addr(tcon->smb_conn->connection->socket, tcon);
 
100
        struct tsocket_address *client_addr;
 
101
 
 
102
        client_addr = tcon->smb_conn->connection->remote_address;
 
103
 
118
104
        DEBUG(3,("%s closed connection to service %s\n",
119
 
                 client_addr ? client_addr->addr : "(unknown)",
 
105
                 tsocket_address_string(client_addr, tcon),
120
106
                 tcon->share_name));
121
107
 
122
108
        /* tell the ntvfs backend that we are disconnecting */