Attachment 278871 Details for Bug 413051 – patch from 1.6.1 to 1.6.3, which should fix this

[patch] patch from 1.6.1 to 1.6.3, which should fix this

krb5-1.6.1-gic_opt_chg_pwd_prmpt.patch (text/plain), 1.47 KB, created by Nalin Dahyabhai on 2007-12-05 22:52:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nalin Dahyabhai

Created: 2007-12-05 22:52:02 UTC

Size: 1.47 KB

patch

obsolete

>Backport from 1.6.3: apps which use the new dynamic get_init_creds_opt
>structure don't get the same defaults as apps which use the old ones.
>--- krb5-1.6.1/src/lib/krb5/krb/gic_opt.c	2007-02-05 18:45:17.000000000 -0500
>+++ krb5-1.6.3/src/lib/krb5/krb/gic_opt.c	2007-10-01 22:42:02.000000000 -0400
>@@ -1,9 +1,17 @@
> #include "k5-int.h"
>+#include "int-proto.h"
>+
>+static void
>+init_common(krb5_get_init_creds_opt *opt)
>+{
>+    opt->flags |= KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT;
>+}
> 
> void KRB5_CALLCONV
> krb5_get_init_creds_opt_init(krb5_get_init_creds_opt *opt)
> {
>-   opt->flags = KRB5_GET_INIT_CREDS_OPT_CHG_PWD_PRMPT;
>+    opt->flags = 0;
>+    init_common(opt);
> }
> 
> void KRB5_CALLCONV
>@@ -173,6 +181,7 @@
> 	return ENOMEM;
> 
>     *opt = (krb5_get_init_creds_opt *) opte;
>+    init_common(*opt);
>     return 0;
> }
> 
>@@ -206,8 +215,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);
>

Actions: View | Diff

Attachments on bug 413051: 278871