← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source4/heimdal/lib/gssapi/mech/gss_duplicate_name.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/heimdal/lib/gssapi/mech/gss_duplicate_name.c
27
27
 */
28
28
 
29
29
#include "mech_locl.h"
30
 
RCSID("$Id$");
31
30
 
32
 
OM_uint32 gss_duplicate_name(OM_uint32 *minor_status,
 
31
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
 
32
gss_duplicate_name(OM_uint32 *minor_status,
33
33
    const gss_name_t src_name,
34
34
    gss_name_t *dest_name)
35
35
{
53
53
                        return (major_status);
54
54
                new_name = (struct _gss_name *) *dest_name;
55
55
                
56
 
                SLIST_FOREACH(mn, &name->gn_mn, gmn_link) {
 
56
                HEIM_SLIST_FOREACH(mn, &name->gn_mn, gmn_link) {
57
57
                    struct _gss_mechanism_name *mn2;
58
58
                    _gss_find_mn(minor_status, new_name,
59
59
                                 mn->gmn_mech_oid, &mn2);
65
65
                        return (GSS_S_FAILURE);
66
66
                }
67
67
                memset(new_name, 0, sizeof(struct _gss_name));
68
 
                SLIST_INIT(&new_name->gn_mn);
 
68
                HEIM_SLIST_INIT(&new_name->gn_mn);
69
69
                *dest_name = (gss_name_t) new_name;
70
70
                
71
 
                SLIST_FOREACH(mn, &name->gn_mn, gmn_link) {
 
71
                HEIM_SLIST_FOREACH(mn, &name->gn_mn, gmn_link) {
72
72
                        struct _gss_mechanism_name *new_mn;
73
73
                        
74
74
                        new_mn = malloc(sizeof(*new_mn));
86
86
                                free(new_mn);
87
87
                                continue;
88
88
                        }
89
 
                        SLIST_INSERT_HEAD(&new_name->gn_mn, new_mn, gmn_link);
 
89
                        HEIM_SLIST_INSERT_HEAD(&new_name->gn_mn, new_mn, gmn_link);
90
90
                }
91
91
 
92
92
        }