← 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_inquire_cred.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_inquire_cred.c
27
27
 */
28
28
 
29
29
#include "mech_locl.h"
30
 
RCSID("$Id$");
31
30
 
32
31
#define AUSAGE 1
33
32
#define IUSAGE 2
43
42
        *usagemask |= IUSAGE;
44
43
}
45
44
 
46
 
OM_uint32 GSSAPI_LIB_FUNCTION
 
45
GSSAPI_LIB_FUNCTION OM_uint32 GSSAPI_LIB_CALL
47
46
gss_inquire_cred(OM_uint32 *minor_status,
48
47
    const gss_cred_id_t cred_handle,
49
48
    gss_name_t *name_ret,
79
78
                        *minor_status = ENOMEM;
80
79
                        return (GSS_S_FAILURE);
81
80
                }
82
 
                SLIST_INIT(&name->gn_mn);
 
81
                HEIM_SLIST_INIT(&name->gn_mn);
83
82
        } else {
84
83
                name = NULL;
85
84
        }
97
96
        if (cred) {
98
97
                struct _gss_mechanism_cred *mc;
99
98
 
100
 
                SLIST_FOREACH(mc, &cred->gc_mc, gmc_link) {
 
99
                HEIM_SLIST_FOREACH(mc, &cred->gc_mc, gmc_link) {
101
100
                        gss_name_t mc_name;
102
101
                        OM_uint32 mc_lifetime;
103
102
 
117
116
                                mn->gmn_mech = mc->gmc_mech;
118
117
                                mn->gmn_mech_oid = mc->gmc_mech_oid;
119
118
                                mn->gmn_name = mc_name;
120
 
                                SLIST_INSERT_HEAD(&name->gn_mn, mn, gmn_link);
 
119
                                HEIM_SLIST_INSERT_HEAD(&name->gn_mn, mn, gmn_link);
121
120
                        } else {
122
121
                                mc->gmc_mech->gm_release_name(minor_status,
123
122
                                    &mc_name);
132
131
                        found++;
133
132
                }
134
133
        } else {
135
 
                SLIST_FOREACH(m, &_gss_mechs, gm_link) {
 
134
                HEIM_SLIST_FOREACH(m, &_gss_mechs, gm_link) {
136
135
                        gss_name_t mc_name;
137
136
                        OM_uint32 mc_lifetime;
138
137
 
154
153
                                mn->gmn_mech = &m->gm_mech;
155
154
                                mn->gmn_mech_oid = &m->gm_mech_oid;
156
155
                                mn->gmn_name = mc_name;
157
 
                                SLIST_INSERT_HEAD(&name->gn_mn, mn, gmn_link);
 
156
                                HEIM_SLIST_INSERT_HEAD(&name->gn_mn, mn, gmn_link);
158
157
                        } else if (mc_name) {
159
158
                                m->gm_mech.gm_release_name(minor_status,
160
159
                                    &mc_name);