← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/heimdal/jaunty

« back to all changes in this revision

Viewing changes to lib/gssapi/mech/gss_mech_switch.c

  • Committer: Bazaar Package Importer
  • Author(s): Nick Ellery
  • Date: 2008-11-17 22:25:58 UTC
  • mfrom: (1.1.5 upstream) (2.1.2 lenny)
  • Revision ID: james.westby@ubuntu.com-20081117222558-jd1aj1jth6ycdb0x
Tags: 1.2.dfsg.1-2.1ubuntu1
https://launchpad.net/bugs/299345
* Merge from debian unstable, remaining changes (LP: #299345):
  - Change libdb4.2-dev to libdb4.6-dev in build-deps
  - Add netbase to heimdal-kdc depends.
  - Set CPPFLAGS=-DLDAP_DEPRECATED to fix build with OpenLDAP 2.4 on
    64-bit architectures.
* Remove dependency on update-inetd to heimdal-servers and heimdal-kdc,
  as packages should rely on the inet-superserver to provide the
  update-inetd command.
* Drop the addition of -1 to the version of comerr-dev in build depends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gssapi/mech/gss_mech_switch.c
28
28
 
29
29
#include "mech_locl.h"
30
30
#include <heim_threads.h>
31
 
RCSID("$Id: gss_mech_switch.c 21698 2007-07-26 19:07:11Z lha $");
 
31
RCSID("$Id: gss_mech_switch.c 22875 2008-04-07 18:50:48Z lha $");
32
32
 
33
33
#ifndef _PATH_GSS_MECH
34
34
#define _PATH_GSS_MECH  "/etc/gss/mech"
46
46
_gss_string_to_oid(const char* s, gss_OID oid)
47
47
{
48
48
        int                     number_count, i, j;
49
 
        int                     byte_count;
 
49
        size_t                  byte_count;
50
50
        const char              *p, *q;
51
51
        char                    *res;
52
52
 
118
118
                                 * The number is encoded in seven bit chunks.
119
119
                                 */
120
120
                                unsigned int t;
121
 
                                int bytes;
 
121
                                unsigned int bytes;
122
122
 
123
123
                                bytes = 0;
124
124
                                for (t = number; t; t >>= 7)