r17732 - in /branches/upstream/libauthen-krb5-perl/current: COPYRIGHT Changes Krb5.pm Krb5.xs krb5_constants.c
roberto at users.alioth.debian.org
roberto at users.alioth.debian.org
Mon Mar 17 04:30:04 UTC 2008
Author: roberto
Date: Mon Mar 17 04:30:02 2008
New Revision: 17732
URL: http://svn.debian.org/wsvn/?sc=1&rev=17732
Log:
[svn-upgrade] Integrating new upstream version, libauthen-krb5-perl (1.8)
Modified:
branches/upstream/libauthen-krb5-perl/current/COPYRIGHT
branches/upstream/libauthen-krb5-perl/current/Changes
branches/upstream/libauthen-krb5-perl/current/Krb5.pm
branches/upstream/libauthen-krb5-perl/current/Krb5.xs
branches/upstream/libauthen-krb5-perl/current/krb5_constants.c
Modified: branches/upstream/libauthen-krb5-perl/current/COPYRIGHT
URL: http://svn.debian.org/wsvn/branches/upstream/libauthen-krb5-perl/current/COPYRIGHT?rev=17732&op=diff
==============================================================================
--- branches/upstream/libauthen-krb5-perl/current/COPYRIGHT (original)
+++ branches/upstream/libauthen-krb5-perl/current/COPYRIGHT Mon Mar 17 04:30:02 2008
@@ -1,3 +1,3 @@
-Copyright (c) 2000-2006 Jeff Horwitz (jeff at smashing.org). All rights reserved.
+Copyright (c) 2000-2008 Jeff Horwitz (jeff at smashing.org). All rights reserved.
This module is free software; you can redistribute it and/or modify it under
the same terms as Perl itself.
Modified: branches/upstream/libauthen-krb5-perl/current/Changes
URL: http://svn.debian.org/wsvn/branches/upstream/libauthen-krb5-perl/current/Changes?rev=17732&op=diff
==============================================================================
--- branches/upstream/libauthen-krb5-perl/current/Changes (original)
+++ branches/upstream/libauthen-krb5-perl/current/Changes Mon Mar 17 04:30:02 2008
@@ -1,4 +1,8 @@
Revision history for Perl extension Krb5.
+
+1.8 Fix broken get_in_tkt_with_password implementation (rra at debian.org)
+ Add some missing prototypes (rra at debian.org)
+ Clean up some compiler warnings (rra at debian.org)
1.7 Use standard search paths for includes and libs
Add get_init_creds_password (rra at debian.org)
Modified: branches/upstream/libauthen-krb5-perl/current/Krb5.pm
URL: http://svn.debian.org/wsvn/branches/upstream/libauthen-krb5-perl/current/Krb5.pm?rev=17732&op=diff
==============================================================================
--- branches/upstream/libauthen-krb5-perl/current/Krb5.pm (original)
+++ branches/upstream/libauthen-krb5-perl/current/Krb5.pm Mon Mar 17 04:30:02 2008
@@ -52,7 +52,7 @@
KRB5_NT_UNKNOWN
KRB5_TGS_NAME
);
-$VERSION = '1.7';
+$VERSION = '1.8';
sub KRB5_TGS_NAME() { return "krbtgt"; }
@@ -560,7 +560,7 @@
=head1 AUTHOR
-Jeff Horwitz (jeff at laserlink.net)
+Jeff Horwitz (jeff at smashing.org)
=head1 ACKNOWLEDGEMENTS
Modified: branches/upstream/libauthen-krb5-perl/current/Krb5.xs
URL: http://svn.debian.org/wsvn/branches/upstream/libauthen-krb5-perl/current/Krb5.xs?rev=17732&op=diff
==============================================================================
--- branches/upstream/libauthen-krb5-perl/current/Krb5.xs (original)
+++ branches/upstream/libauthen-krb5-perl/current/Krb5.xs Mon Mar 17 04:30:02 2008
@@ -4,6 +4,9 @@
#include "EXTERN.h"
#include "perl.h"
#include "XSUB.h"
+
+/* We currently provide some private functions and probably shouldn't. */
+#define KRB5_PRIVATE 1
#include <krb5.h>
#include <com_err.h>
#include <errno.h>
@@ -38,6 +41,14 @@
static krb5_keytab_entry keytab_entry_init;
/*
+ * These are internal Kerberos library functions that aren't prototyped and
+ * that we probably shouldn't be calling. Prototype them with the arguments
+ * we expect and leave them for now pending an API cleanup.
+ */
+krb5_error_code krb5_free_krbhst(krb5_context, char * const *);
+krb5_error_code krb5_get_krbhst(krb5_context, const krb5_data *, char ***);
+
+/*
* The following three routines implement a "safehouse" for nested Kerberos
* data structures which shouldn't be freed before their parent data
* structures are freed. Without this, "Bad free() ignored" errors as well
@@ -100,7 +111,7 @@
}
else {
ST(0) = sv_2mortal(newSVpv((char *)error_message(err), 0));
- SvUPGRADE(ST(0), SVt_PVIV);
+ (void) SvUPGRADE(ST(0), SVt_PVIV);
SvIVX(ST(0)) = err;
SvIOK_on(ST(0));
}
@@ -275,7 +286,7 @@
OUTPUT:
RETVAL
-char *
+SV *
krb5_kt_default_name()
CODE:
char name[BUFSIZ];
@@ -283,7 +294,10 @@
if (err)
XSRETURN_UNDEF;
name[sizeof name - 1] = '\0';
- ST(0) = sv_2mortal(newSVpv(name, 0));
+ RETVAL = newSVpv(name, 0);
+
+ OUTPUT:
+ RETVAL
Authen::Krb5::Keytab
krb5_kt_default()
@@ -292,8 +306,8 @@
if (err)
XSRETURN_UNDEF;
- OUTPUT:
- RETVAL
+ OUTPUT:
+ RETVAL
Authen::Krb5::Keyblock
krb5_kt_read_service_key(name, principal, kvno = 0, enctype = 0)
@@ -392,7 +406,7 @@
err = krb5_unparse_name(context, server, &service);
if (err) XSRETURN_UNDEF;
- err = krb5_get_in_tkt_with_password(context, &cr, client, password,
+ err = krb5_get_init_creds_password(context, &cr, client, password,
NULL, NULL, 0, service, &opt);
free(service);
if (err) XSRETURN_UNDEF;
@@ -480,7 +494,6 @@
PREINIT:
krb5_data in_data;
krb5_ticket *t;
- krb5_flags ap_req_options;
CODE:
if (!New(0,t,1,krb5_ticket)) XSRETURN_UNDEF;
@@ -948,9 +961,6 @@
getkey(auth_context)
Authen::Krb5::AuthContext auth_context;
- PREINIT:
- SV *sv;
-
CODE:
err = krb5_auth_con_getkey(context, auth_context, &RETVAL);
if (err) XSRETURN_UNDEF;
@@ -1072,15 +1082,17 @@
OUTPUT:
RETVAL
-krb5_octet *
+SV *
contents(keyblock)
Authen::Krb5::Keyblock keyblock
- CODE:
- ST(0) = keyblock->contents
- ? sv_2mortal(newSVpv(keyblock->contents, keyblock->length))
- : &PL_sv_undef;
-
+ CODE:
+ if (keyblock->contents == NULL)
+ XSRETURN_UNDEF;
+ RETVAL = newSVpv((char *) keyblock->contents, keyblock->length);
+
+ OUTPUT:
+ RETVAL
void
DESTROY(keyblock)
Modified: branches/upstream/libauthen-krb5-perl/current/krb5_constants.c
URL: http://svn.debian.org/wsvn/branches/upstream/libauthen-krb5-perl/current/krb5_constants.c?rev=17732&op=diff
==============================================================================
--- branches/upstream/libauthen-krb5-perl/current/krb5_constants.c (original)
+++ branches/upstream/libauthen-krb5-perl/current/krb5_constants.c Mon Mar 17 04:30:02 2008
@@ -1,11 +1,3 @@
-static int
-not_here(s)
-char *s;
-{
- croak("%s not implemented on this architecture", s);
- return -1;
-}
-
static double
constant(name, arg)
char *name;
@@ -1366,18 +1358,6 @@
#else
goto not_there;
#endif
- if (strEQ(name, "KRB5_CALLCONV"))
-#ifdef KRB5_CALLCONV
- return KRB5_CALLCONV;
-#else
- goto not_there;
-#endif
- if (strEQ(name, "KRB5_CALLCONV_C"))
-#ifdef KRB5_CALLCONV_C
- return KRB5_CALLCONV_C;
-#else
- goto not_there;
-#endif
if (strEQ(name, "KRB5_CCACHE_BADVNO"))
#ifdef KRB5_CCACHE_BADVNO
return KRB5_CCACHE_BADVNO;
@@ -1555,12 +1535,6 @@
if (strEQ(name, "KRB5_GC_USER_USER"))
#ifdef KRB5_GC_USER_USER
return KRB5_GC_USER_USER;
-#else
- goto not_there;
-#endif
- if (strEQ(name, "KRB5_GENERAL__"))
-#ifdef KRB5_GENERAL__
- return KRB5_GENERAL__;
#else
goto not_there;
#endif
@@ -3040,24 +3014,6 @@
case 'z':
break;
case '_':
- if (strEQ(name, "_MACINTOSH"))
-#ifdef _MACINTOSH
- return _MACINTOSH;
-#else
- goto not_there;
-#endif
- if (strEQ(name, "_SIZET"))
-#ifdef _SIZET
- return _SIZET;
-#else
- goto not_there;
-#endif
- if (strEQ(name, "_SIZE_T_DEFINED"))
-#ifdef _SIZE_T_DEFINED
- return _SIZE_T_DEFINED;
-#else
- goto not_there;
-#endif
break;
}
errno = EINVAL;
More information about the Pkg-perl-cvs-commits
mailing list