← Back to branch summary

~lefteris-nikoltsios/+junk/samba-lp1016895

« back to all changes in this revision

Viewing changes to source3/lib/afs.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/lib/afs.c
23
23
 
24
24
#define NO_ASN1_TYPEDEFS 1
25
25
 
 
26
#include "secrets.h"
 
27
#include "passdb.h"
 
28
#include "auth.h"
 
29
#include "../librpc/gen_ndr/ndr_netlogon.h"
 
30
 
26
31
#include <afs/param.h>
27
32
#include <afs/stds.h>
28
33
#include <afs/afs.h>
219
224
        char *cell = NULL;
220
225
        bool result;
221
226
        char *ticket_str = NULL;
222
 
        const DOM_SID *user_sid;
 
227
        const struct dom_sid *user_sid;
223
228
        TALLOC_CTX *ctx = talloc_tos();
224
229
 
225
230
        struct ClearToken ct;
231
236
        }
232
237
 
233
238
        afs_username = talloc_sub_advanced(ctx,
234
 
                                SNUM(conn), conn->server_info->unix_name,
235
 
                                conn->connectpath, conn->server_info->utok.gid,
236
 
                                conn->server_info->sanitized_username,
237
 
                                pdb_get_domain(conn->server_info->sam_account),
 
239
                                lp_servicename(SNUM(conn)),
 
240
                                conn->session_info->unix_name,
 
241
                                conn->connectpath, conn->session_info->utok.gid,
 
242
                                conn->session_info->sanitized_username,
 
243
                                conn->session_info->info3->base.domain.string,
238
244
                                afs_username);
239
245
        if (!afs_username) {
240
246
                return false;
241
247
        }
242
248
 
243
 
        user_sid = &conn->server_info->ptok->user_sids[0];
 
249
        user_sid = &conn->session_info->security_token->sids[0];
244
250
        afs_username = talloc_string_sub(talloc_tos(),
245
251
                                        afs_username,
246
252
                                        "%s",