- update krb5-1.8-POST.dif

OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=16
2010-04-06 12:16:20 +00:00
parent 527022b424
commit 9b7065a839
4 changed files with 215 additions and 1 deletions
--- a/krb5-1.8-POST.dif
+++ b/krb5-1.8-POST.dif
@@ -313,3 +313,207 @@ Index: src/lib/krb5/krb/gic_pwd.c
         goto cleanup;
 
     /* ok, we have an expired password.  Give the user a few chances
+Index: src/lib/gssapi/krb5/import_sec_context.c
+===================================================================
+--- src/lib/gssapi/krb5/import_sec_context.c	(Revision 23830)
+++ src/lib/gssapi/krb5/import_sec_context.c	(Arbeitskopie)
+@@ -106,12 +106,13 @@
+     ibp = (krb5_octet *) interprocess_token->value;
+     blen = (size_t) interprocess_token->length;
+     kret = kg_ctx_internalize(context, (krb5_pointer *) &ctx, &ibp, &blen);
+-    krb5_free_context(context);
+     if (kret) {
+         *minor_status = (OM_uint32) kret;
+         save_error_info(*minor_status, context);
+        krb5_free_context(context);
+         return(GSS_S_FAILURE);
+     }
+    krb5_free_context(context);
+ 
+     /* intern the context handle */
+     if (! kg_save_ctx_id((gss_ctx_id_t) ctx)) {
+Index: src/lib/gssapi/mechglue/deps
+===================================================================
+--- src/lib/gssapi/mechglue/deps	(Revision 23830)
+++ src/lib/gssapi/mechglue/deps	(Arbeitskopie)
+@@ -358,6 +358,14 @@
+   $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+   ../generic/gssapi_err_generic.h g_set_name_attr.c mechglue.h \
+   mglueP.h
+g_set_neg_mechs.so g_set_neg_mechs.po $(OUTPRE)g_set_neg_mechs.$(OBJEXT): \
+  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/gssapi/gssapi.h \
+  $(BUILDTOP)/include/gssapi/gssapi_ext.h $(COM_ERR_DEPS) \
+  $(srcdir)/../generic/gssapiP_generic.h $(srcdir)/../generic/gssapi_ext.h \
+  $(srcdir)/../generic/gssapi_generic.h $(top_srcdir)/include/k5-buf.h \
+  $(top_srcdir)/include/k5-platform.h $(top_srcdir)/include/k5-thread.h \
+  ../generic/gssapi_err_generic.h g_set_neg_mechs.c mechglue.h \
+  mglueP.h
+ g_sign.so g_sign.po $(OUTPRE)g_sign.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+   $(BUILDTOP)/include/gssapi/gssapi.h $(BUILDTOP)/include/gssapi/gssapi_ext.h \
+   $(COM_ERR_DEPS) $(srcdir)/../generic/gssapiP_generic.h \
+Index: src/lib/krb5/krb/get_in_tkt.c
+===================================================================
+--- src/lib/krb5/krb/get_in_tkt.c	(Revision 23830)
+++ src/lib/krb5/krb/get_in_tkt.c	(Arbeitskopie)
+@@ -1083,7 +1083,7 @@
+                                     &flags);
+         if (code == KRB5KRB_ERR_RESPONSE_TOO_BIG && !tcp_only)
+             tcp_only = 1;
+-        else if (code != 0 || (flags & KRB5_INIT_CREDS_STEP_FLAG_COMPLETE))
+        else if (code != 0 || (flags & 1) == 0)
+             break;
+ 
+         krb5_free_data_contents(context, &reply);
+@@ -2065,7 +2065,7 @@
+         }
+     }
+ 
+-    *flags = (ctx->flags & KRB5_INIT_CREDS_STEP_FLAG_COMPLETE);
+    *flags = (ctx->flags & KRB5_INIT_CREDS_STEP_FLAG_COMPLETE) ? 0 : 1;
+ 
+     return code;
+ }
+Index: src/lib/krb5/krb/deps
+===================================================================
+--- src/lib/krb5/krb/deps	(Revision 23830)
+++ src/lib/krb5/krb/deps	(Arbeitskopie)
+@@ -63,45 +63,10 @@
+   $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+   $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+   $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h auth_con.h authdata.c \
+-  authdata.h int-proto.h
+-authdata_exp.so authdata_exp.po $(OUTPRE)authdata_exp.$(OBJEXT): \
+-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h auth_con.h authdata.h \
+-  authdata_exp.c int-proto.h
+-authdata_enc.so authdata_enc.po $(OUTPRE)authdata_enc.$(OBJEXT): \
+-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+   $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+   $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  authdata_enc.c
+-authdata_dec.so authdata_dec.po $(OUTPRE)authdata_dec.$(OBJEXT): \
+-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+-  $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  authdata_dec.c int-proto.h
+  auth_con.h authdata.c authdata.h int-proto.h
+ bld_pr_ext.so bld_pr_ext.po $(OUTPRE)bld_pr_ext.$(OBJEXT): \
+   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+@@ -190,7 +155,7 @@
+   $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+   $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  copy_auth.c int-proto.h
+  copy_auth.c
+ copy_athctr.so copy_athctr.po $(OUTPRE)copy_athctr.$(OBJEXT): \
+   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+@@ -201,7 +166,7 @@
+   $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+   $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  auth_con.h copy_athctr.c
+  copy_athctr.c
+ copy_cksum.so copy_cksum.po $(OUTPRE)copy_cksum.$(OBJEXT): \
+   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+@@ -669,17 +634,6 @@
+   $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+   authdata.h pac.c
+-pac_sign.so pac_sign.po $(OUTPRE)pac_sign.$(OBJEXT): \
+-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h authdata.h pac_sign.c
+ parse.so parse.po $(OUTPRE)parse.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+@@ -722,17 +676,6 @@
+   $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+   fast.h int-proto.h preauth2.c
+-gic_opt_set_pa.so gic_opt_set_pa.po $(OUTPRE)gic_opt_set_pa.$(OBJEXT): \
+-  $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+-  $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+-  $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h $(top_srcdir)/include/k5-err.h \
+-  $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+-  $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+-  $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+-  $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+-  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  gic_opt_set_pa.c int-proto.h
+ princ_comp.so princ_comp.po $(OUTPRE)princ_comp.$(OBJEXT): \
+   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+@@ -805,11 +748,10 @@
+   $(top_srcdir)/include/k5-gmt_mktime.h $(top_srcdir)/include/k5-int-pkinit.h \
+   $(top_srcdir)/include/k5-int.h $(top_srcdir)/include/k5-platform.h \
+   $(top_srcdir)/include/k5-plugin.h $(top_srcdir)/include/k5-thread.h \
+-  $(top_srcdir)/include/k5-utf8.h $(top_srcdir)/include/krb5.h \
+-  $(top_srcdir)/include/krb5/authdata_plugin.h $(top_srcdir)/include/krb5/locate_plugin.h \
+-  $(top_srcdir)/include/krb5/preauth_plugin.h $(top_srcdir)/include/port-sockets.h \
+-  $(top_srcdir)/include/socket-utils.h auth_con.h authdata.h \
+-  int-proto.h rd_req_dec.c
+  $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+  $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+  $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+  auth_con.h authdata.h int-proto.h rd_req_dec.c
+ rd_safe.so rd_safe.po $(OUTPRE)rd_safe.$(OBJEXT): $(BUILDTOP)/include/autoconf.h \
+   $(BUILDTOP)/include/krb5/krb5.h $(BUILDTOP)/include/osconf.h \
+   $(BUILDTOP)/include/profile.h $(COM_ERR_DEPS) $(top_srcdir)/include/k5-buf.h \
+@@ -1038,7 +980,7 @@
+   $(top_srcdir)/include/krb5.h $(top_srcdir)/include/krb5/authdata_plugin.h \
+   $(top_srcdir)/include/krb5/locate_plugin.h $(top_srcdir)/include/krb5/preauth_plugin.h \
+   $(top_srcdir)/include/port-sockets.h $(top_srcdir)/include/socket-utils.h \
+-  int-proto.h valid_times.c
+  valid_times.c
+ vfy_increds.so vfy_increds.po $(OUTPRE)vfy_increds.$(OBJEXT): \
+   $(BUILDTOP)/include/autoconf.h $(BUILDTOP)/include/krb5/krb5.h \
+   $(BUILDTOP)/include/osconf.h $(BUILDTOP)/include/profile.h \
+Index: src/util/ss/deps
+===================================================================
+--- src/util/ss/deps	(Revision 23830)
+++ src/util/ss/deps	(Arbeitskopie)
+@@ -63,7 +63,7 @@
+   ss_internal.h utils.c
+ options.so options.po $(OUTPRE)options.$(OBJEXT): $(BUILDTOP)/include/ss/ss_err.h \
+   $(COM_ERR_DEPS) copyright.h options.c ss.h
+-cmd_tbl.lex.o: cmd_tbl.lex.c
+cmd_tbl.lex.o: cmd_tbl.lex.c ct.tab.h
+ ct.tab.o: $(BUILDTOP)/include/ss/ss_err.h $(COM_ERR_DEPS) \
+   ct.tab.c ss.h
+ ss_err.so ss_err.po $(OUTPRE)ss_err.$(OBJEXT): $(COM_ERR_DEPS) \
+
--- a/krb5-mini.changes
+++ b/krb5-mini.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  6 14:14:56 CEST 2010 - mc@suse.de
+
+- update krb5-1.8-POST.dif 
+
 -------------------------------------------------------------------
 Tue Mar 23 14:32:41 CET 2010 - mc@suse.de

--- a/krb5-mini.spec
+++ b/krb5-mini.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package krb5-mini (Version 1.8)
+# spec file for package krb5 (Version 1.8)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
--- a/krb5.changes
+++ b/krb5.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  6 14:14:56 CEST 2010 - mc@suse.de
+
+- update krb5-1.8-POST.dif 
+
 -------------------------------------------------------------------
 Tue Mar 23 14:32:41 CET 2010 - mc@suse.de