diff --git a/krb5-1.6.1-post.dif b/krb5-1.6.1-post.dif new file mode 100644 index 0000000..30f3697 --- /dev/null +++ b/krb5-1.6.1-post.dif @@ -0,0 +1,123 @@ +Index: src/include/k5-int.h +=================================================================== +--- src/include/k5-int.h (.../tags/krb5-1-6-1-final) (Revision 19540) ++++ src/include/k5-int.h (.../branches/krb5-1-6) (Revision 19540) +@@ -1048,9 +1048,9 @@ + #define KRB5_GET_INIT_CREDS_OPT_SHADOWED 0x40000000 + + #define krb5_gic_opt_is_extended(s) \ +- (((s)->flags & KRB5_GET_INIT_CREDS_OPT_EXTENDED) ? 1 : 0) ++ ((s) && ((s)->flags & KRB5_GET_INIT_CREDS_OPT_EXTENDED) ? 1 : 0) + #define krb5_gic_opt_is_shadowed(s) \ +- (((s)->flags & KRB5_GET_INIT_CREDS_OPT_SHADOWED) ? 1 : 0) ++ ((s) && ((s)->flags & KRB5_GET_INIT_CREDS_OPT_SHADOWED) ? 1 : 0) + + + typedef struct _krb5_gic_opt_private { +Index: src/appl/gssftp/ftp/cmds.c +=================================================================== +--- src/appl/gssftp/ftp/cmds.c (.../tags/krb5-1-6-1-final) (Revision 19540) ++++ src/appl/gssftp/ftp/cmds.c (.../branches/krb5-1-6) (Revision 19540) +@@ -168,9 +168,7 @@ + } + port = htons(iport); + } +-printf("%s: at line %d\n", __FILE__, __LINE__); + host = hookup(argv[1], port); +-printf("%s: at line %d\n", __FILE__, __LINE__); + if (host) { + int overbose; + +@@ -185,28 +183,20 @@ + mode = MODE_S; + stru = STRU_F; + (void) strcpy(bytename, "8"), bytesize = 8; +-printf("%s: at line %d\n", __FILE__, __LINE__); + if (autoauth) { +-printf("%s: at line %d\n", __FILE__, __LINE__); + if (do_auth() && autoencrypt) { +-printf("%s: at line %d\n", __FILE__, __LINE__); + clevel = PROT_P; + setpbsz(1<<20); + if (command("PROT P") == COMPLETE) + dlevel = PROT_P; + else + fprintf(stderr, "ftp: couldn't enable encryption\n"); +-printf("%s: at line %d\n", __FILE__, __LINE__); + } +-printf("%s: at line %d\n", __FILE__, __LINE__); + if(auth_type && clevel == PROT_C) + clevel = PROT_S; +-printf("%s: at line %d\n", __FILE__, __LINE__); + if(autologin) + (void) login(argv[1]); +-printf("%s: at line %d\n", __FILE__, __LINE__); + } +-printf("%s: at line %d\n", __FILE__, __LINE__); + + #ifndef unix + /* sigh */ +@@ -221,7 +211,6 @@ + * this ifdef is to keep someone form "porting" this to an incompatible + * system and not checking this out. This way they have to think about it. + */ +-printf("%s: at line %d\n", __FILE__, __LINE__); + overbose = verbose; + if (debug == 0) + verbose = -1; +Index: src/lib/krb5/krb/gc_frm_kdc.c +=================================================================== +--- src/lib/krb5/krb/gc_frm_kdc.c (.../tags/krb5-1-6-1-final) (Revision 19540) ++++ src/lib/krb5/krb/gc_frm_kdc.c (.../branches/krb5-1-6) (Revision 19540) +@@ -1043,6 +1043,7 @@ + krb5_free_creds(context, (*tgts)[i]); + } + free(*tgts); ++ *tgts = NULL; + } + context->use_conf_ktypes = 1; + retval = krb5_cc_retrieve_cred(context, ccache, RETR_FLAGS, +Index: src/lib/krb5/krb/gic_opt.c +=================================================================== +--- src/lib/krb5/krb/gic_opt.c (.../tags/krb5-1-6-1-final) (Revision 19540) ++++ src/lib/krb5/krb/gic_opt.c (.../branches/krb5-1-6) (Revision 19540) +@@ -206,8 +206,18 @@ + oe = krb5int_gic_opte_alloc(context); + if (NULL == oe) + return ENOMEM; +- memcpy(oe, opt, sizeof(*opt)); +- /* Fix these -- overwritten by the copy */ ++ ++ if (opt) ++ memcpy(oe, opt, sizeof(*opt)); ++ ++ /* ++ * Fix the flags -- the EXTENDED flag would have been ++ * overwritten by the copy if there was one. The ++ * SHADOWED flag is necessary to ensure that the ++ * krb5_gic_opt_ext structure that was allocated ++ * here will be freed by the library because the ++ * application is unaware of its existence. ++ */ + oe->flags |= ( KRB5_GET_INIT_CREDS_OPT_EXTENDED | + KRB5_GET_INIT_CREDS_OPT_SHADOWED); + +Index: src/util/profile/prof_parse.c +=================================================================== +--- src/util/profile/prof_parse.c (.../tags/krb5-1-6-1-final) (Revision 19540) ++++ src/util/profile/prof_parse.c (.../branches/krb5-1-6) (Revision 19540) +@@ -306,8 +306,10 @@ + */ + static int need_double_quotes(char *str) + { +- if (!str || !*str) +- return 0; ++ if (!str) ++ return 0; ++ if (*str) ++ return 1; + if (isspace((int) (*str)) ||isspace((int) (*(str + strlen(str) - 1)))) + return 1; + if (strchr(str, '\n') || strchr(str, '\t') || strchr(str, '\b')) + + diff --git a/krb5-doc.spec b/krb5-doc.spec index f874f88..4a9aace 100644 --- a/krb5-doc.spec +++ b/krb5-doc.spec @@ -13,7 +13,7 @@ Name: krb5-doc BuildRequires: ghostscript-library latex2html texlive Version: 1.6.1 -Release: 4 +Release: 9 %define srcRoot krb5-1.6.1 Summary: MIT Kerberos5 Implementation--Documentation License: X11/MIT diff --git a/krb5-plugins.changes b/krb5-plugins.changes index 7f437bc..438b4e5 100644 --- a/krb5-plugins.changes +++ b/krb5-plugins.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 3 12:13:35 CEST 2007 - mc@suse.de + +- adding krb5-1.6.1-post.dif + * fix segfault in krb5_get_init_creds_password + * remove debug output in ftp client + * profile stores empty string values without double quotes + ------------------------------------------------------------------- Mon Apr 23 11:17:04 CEST 2007 - mc@suse.de diff --git a/krb5-plugins.spec b/krb5-plugins.spec index f1467d4..e1455aa 100644 --- a/krb5-plugins.spec +++ b/krb5-plugins.spec @@ -13,7 +13,7 @@ Name: krb5-plugins Version: 1.6.1 -Release: 3 +Release: 4 BuildRequires: bison krb5-devel ncurses-devel openldap2-devel %define srcRoot krb5-1.6.1 %define vendorFiles %{_builddir}/%{srcRoot}/vendor-files/ @@ -31,8 +31,7 @@ Source4: EncryptWithMasterKey.c Patch1: krb5-1.5.1-fix-too-few-arguments.dif Patch2: krb5-1.6.1-compile_pie.dif Patch3: krb5-1.4-fix-segfault.dif -#Patch4: krb5-1.6-post.dif -#Patch5: krb5-1.6-patchlevel.dif +Patch4: krb5-1.6.1-post.dif Patch6: trunk-EncryptWithMasterKey.dif Patch14: warning-fix-lib-crypto-des.dif Patch15: warning-fix-lib-crypto-dk.dif @@ -95,8 +94,7 @@ fi %patch1 %patch2 %patch3 -#%patch4 -#%patch5 +%patch4 %patch6 %patch14 %patch15 @@ -205,6 +203,11 @@ rm -rf %{buildroot} %{_mandir}/man8/* %changelog +* Thu May 03 2007 - mc@suse.de +- adding krb5-1.6.1-post.dif + * fix segfault in krb5_get_init_creds_password + * remove debug output in ftp client + * profile stores empty string values without double quotes * Mon Apr 23 2007 - mc@suse.de - update to final 1.6.1 version * Mon Apr 16 2007 - mc@suse.de diff --git a/krb5.changes b/krb5.changes index a055853..d7b515b 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 3 12:11:29 CEST 2007 - mc@suse.de + +- adding krb5-1.6.1-post.dif + * fix segfault in krb5_get_init_creds_password + * remove debug output in ftp client + * profile stores empty string values without double quotes + ------------------------------------------------------------------- Mon Apr 23 11:15:10 CEST 2007 - mc@suse.de diff --git a/krb5.spec b/krb5.spec index 73afcad..80d1d89 100644 --- a/krb5.spec +++ b/krb5.spec @@ -12,7 +12,7 @@ Name: krb5 Version: 1.6.1 -Release: 4 +Release: 9 BuildRequires: bison libcom_err ncurses-devel %if %{suse_version} > 1010 BuildRequires: keyutils keyutils-devel @@ -34,8 +34,7 @@ Source4: EncryptWithMasterKey.c Patch1: krb5-1.5.1-fix-too-few-arguments.dif Patch2: krb5-1.6.1-compile_pie.dif Patch3: krb5-1.4-fix-segfault.dif -#Patch4: krb5-1.6-post.dif -#Patch5: krb5-1.6-patchlevel.dif +Patch4: krb5-1.6.1-post.dif Patch6: trunk-EncryptWithMasterKey.dif Patch14: warning-fix-lib-crypto-des.dif Patch15: warning-fix-lib-crypto-dk.dif @@ -185,8 +184,7 @@ fi %patch1 %patch2 %patch3 -#%patch4 -#%patch5 +%patch4 %patch6 %patch14 %patch15 @@ -503,6 +501,11 @@ rm -rf %{buildroot} %{_mandir}/man1/krb5-config.1* %changelog +* Thu May 03 2007 - mc@suse.de +- adding krb5-1.6.1-post.dif + * fix segfault in krb5_get_init_creds_password + * remove debug output in ftp client + * profile stores empty string values without double quotes * Mon Apr 23 2007 - mc@suse.de - update to final 1.6.1 version * Wed Apr 18 2007 - mc@suse.de