← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source4/torture/masktest.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/torture/masktest.c
22
22
#include "system/filesys.h"
23
23
#include "system/dir.h"
24
24
#include "libcli/libcli.h"
25
 
#include "libcli/raw/libcliraw.h"
26
25
#include "system/time.h"
27
26
#include "auth/credentials/credentials.h"
28
27
#include "auth/gensec/gensec.h"
29
28
#include "param/param.h"
30
 
#include "dynconfig/dynconfig.h"
31
29
#include "libcli/resolve/resolve.h"
32
30
#include "lib/events/events.h"
33
31
 
79
77
                                        const char *socket_options,
80
78
                                        struct smbcli_options *options,
81
79
                                        struct smbcli_session_options *session_options,
82
 
                                        struct smb_iconv_convenience *iconv_convenience,
83
80
                                        struct gensec_settings *gensec_settings)
84
81
{
85
82
        struct smbcli_state *c;
101
98
                                        socket_options,
102
99
                                        cmdline_credentials, resolve_ctx, ev,
103
100
                                        options, session_options,
104
 
                                        iconv_convenience,
105
101
                                        gensec_settings);
106
102
 
107
103
        if (!NT_STATUS_IS_OK(status)) {
335
331
        while((opt = poptGetNextOpt(pc)) != -1) {
336
332
                switch (opt) {
337
333
                case OPT_UNCLIST:
338
 
                        lp_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
 
334
                        lpcfg_set_cmdline(cmdline_lp_ctx, "torture:unclist", poptGetOptArg(pc));
339
335
                        break;
340
336
                }
341
337
        }
368
364
 
369
365
        gensec_init(lp_ctx);
370
366
 
371
 
        lp_smbcli_options(lp_ctx, &options);
372
 
        lp_smbcli_session_options(lp_ctx, &session_options);
 
367
        lpcfg_smbcli_options(lp_ctx, &options);
 
368
        lpcfg_smbcli_session_options(lp_ctx, &session_options);
373
369
 
374
 
        cli = connect_one(lp_resolve_context(lp_ctx), ev, mem_ctx, share, 
375
 
                          lp_smb_ports(lp_ctx), lp_socket_options(lp_ctx), 
 
370
        cli = connect_one(lpcfg_resolve_context(lp_ctx), ev, mem_ctx, share,
 
371
                          lpcfg_smb_ports(lp_ctx), lpcfg_socket_options(lp_ctx),
376
372
                          &options, &session_options,
377
 
                          lp_iconv_convenience(lp_ctx),
378
 
                          lp_gensec_settings(mem_ctx, lp_ctx));
 
373
                          lpcfg_gensec_settings(mem_ctx, lp_ctx));
379
374
        if (!cli) {
380
375
                DEBUG(0,("Failed to connect to %s\n", share));
381
376
                exit(1);