← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source4/torture/raw/offline.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/raw/offline.c
22
22
 */
23
23
 
24
24
#include "includes.h"
25
 
#include "torture/torture.h"
26
 
#include "libcli/raw/libcliraw.h"
27
25
#include "system/time.h"
28
26
#include "system/filesys.h"
29
27
#include "libcli/libcli.h"
30
28
#include "torture/util.h"
31
29
#include "lib/events/events.h"
32
 
#include "lib/cmdline/popt_common.h"
33
30
#include "libcli/composite/composite.h"
34
31
#include "libcli/smb_composite/smb_composite.h"
35
 
#include "libcli/resolve/resolve.h"
36
32
 
37
33
#define BASEDIR "\\testoffline"
38
34
 
321
317
        struct offline_state *state = (struct offline_state *)req->async.private_data;
322
318
        NTSTATUS status = smbcli_request_simple_recv(req);
323
319
        if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE) ||
324
 
            NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT)) {
 
320
            NT_STATUS_EQUAL(status, NT_STATUS_LOCAL_DISCONNECT) ||
 
321
            NT_STATUS_EQUAL(status, NT_STATUS_CONNECTION_RESET)) {
325
322
                talloc_free(state->tree);
326
323
                state->tree = NULL;
327
324
                num_connected--;