← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source3/libsmb/libsmb_server.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:
source3/libsmb/libsmb_server.c
24
24
*/
25
25
 
26
26
#include "includes.h"
 
27
#include "libsmb/libsmb.h"
27
28
#include "libsmbclient.h"
28
29
#include "libsmb_internal.h"
29
 
 
 
30
#include "../librpc/gen_ndr/ndr_lsa.h"
 
31
#include "rpc_client/cli_pipe.h"
 
32
#include "rpc_client/cli_lsarpc.h"
 
33
#include "libcli/security/security.h"
 
34
#include "libsmb/nmblib.h"
30
35
 
31
36
/* 
32
37
 * Check a server for being alive and well.
330
335
                        if (is_ipc) {
331
336
                                DEBUG(4,
332
337
                                      ("IPC$ so ignore case sensitivity\n"));
333
 
                        } else if (!cli_get_fs_attr_info(c, &fs_attrs)) {
 
338
                        } else if (!NT_STATUS_IS_OK(cli_get_fs_attr_info(c, &fs_attrs))) {
334
339
                                DEBUG(4, ("Could not retrieve "
335
340
                                          "case sensitivity flag: %s.\n",
336
341
                                          cli_errstr(c)));
567
572
        /* Determine if this share supports case sensitivity */
568
573
        if (is_ipc) {
569
574
                DEBUG(4, ("IPC$ so ignore case sensitivity\n"));
570
 
        } else if (!cli_get_fs_attr_info(c, &fs_attrs)) {
 
575
        } else if (!NT_STATUS_IS_OK(cli_get_fs_attr_info(c, &fs_attrs))) {
571
576
                DEBUG(4, ("Could not retrieve case sensitivity flag: %s.\n",
572
577
                          cli_errstr(c)));
573
578
 
775
780
                                                *pp_workgroup,
776
781
                                                *pp_password,
777
782
                                                flags,
778
 
                                                Undefined, NULL);
 
783
                                                Undefined);
779
784
                if (! NT_STATUS_IS_OK(nt_status)) {
780
785
                        DEBUG(1,("cli_full_connection failed! (%s)\n",
781
786
                                 nt_errstr(nt_status)));