Bug 8957 - Typo in pam_winbindd code MUST fix.
Typo in pam_winbindd code MUST fix.
Status: RESOLVED FIXED
Product: Samba 3.6
Classification: Unclassified
Component: Winbind
unspecified
All All
: P5 regression
: ---
Assigned To: Karolin Seeger
Samba QA Contact
:
Depends on:
Blocks: 8595
  Show dependency treegraph
 
Reported: 2012-05-26 00:18 UTC by Jeremy Allison
Modified: 2012-05-26 20:13 UTC (History)
0 users

See Also:


Attachments
Fix for 3.5.x and 3.6.x. (772 bytes, patch)
2012-05-26 00:20 UTC, Jeremy Allison
jra: review? (kseeger)
metze: review+
Details

Note You need to log in before you can comment on or make changes to this bug.
Description Jeremy Allison 2012-05-26 00:18:18 UTC
So in the fix that went in here in v3-5-test (top of tree):

git diff f5d942840bd5e2d728cbf7e4ab4d9dae25cb3323..76dcbb84e3fa13959df5931d21051695327c29f4

Part of it looked like:

@@ -2290,7 +2290,7 @@ static const char *get_conf_item_string(struct pwb_context *ctx,
                        goto out;
                }

-               parm_opt = iniparser_getstr(ctx->dict, key);
+               parm_opt = iniparser_getstring,(ctx->dict, key, NULL);
                TALLOC_FREE(key);

                _pam_log_debug(ctx, LOG_INFO, "CONFIG file: %s '%s'\n",

Note there's an extra comma character after the:

iniparser_getstring,

call - which is valid C but doesn't do what we want :-).

Now I did the last update that is in that tree
(76dcbb84e3fa13959df5931d21051695327c29f4..)
but I missed that comma.

Do either of you (Simo or Karolin) remember what bugid
it was that the fix was attached to for 3.5.x that
caused this error ?

Oh - the same comma is present in the v3-6-test git
tree I think !

This is a must-fix before 3.5.next or 3.6.next release,
as :

parm_opt = iniparser_getstring,(ctx->dict, key, NULL);

compiles, but doesn't do what the programmer expects :-).

Cheers,

        Jeremy
Comment 1 Jeremy Allison 2012-05-26 00:20:52 UTC
Created attachment 7600 [details]
Fix for 3.5.x and 3.6.x.

Karolin please apply for 3.5.next and 3.6.next.
Comment 2 Stefan Metzmacher 2012-05-26 08:54:29 UTC
Comment on attachment 7600 [details]
Fix for 3.5.x and 3.6.x.

:-)
Comment 3 Karolin Seeger 2012-05-26 20:12:21 UTC
(In reply to comment #0)
> So in the fix that went in here in v3-5-test (top of tree):
> 
> git diff
> f5d942840bd5e2d728cbf7e4ab4d9dae25cb3323..76dcbb84e3fa13959df5931d21051695327c29f4
> 
> Part of it looked like:
> 
> @@ -2290,7 +2290,7 @@ static const char *get_conf_item_string(struct
> pwb_context *ctx,
>                         goto out;
>                 }
> 
> -               parm_opt = iniparser_getstr(ctx->dict, key);
> +               parm_opt = iniparser_getstring,(ctx->dict, key, NULL);
>                 TALLOC_FREE(key);
> 
>                 _pam_log_debug(ctx, LOG_INFO, "CONFIG file: %s '%s'\n",
> 
> Note there's an extra comma character after the:
> 
> iniparser_getstring,
> 
> call - which is valid C but doesn't do what we want :-).
> 
> Now I did the last update that is in that tree
> (76dcbb84e3fa13959df5931d21051695327c29f4..)
> but I missed that comma.
> 
> Do either of you (Simo or Karolin) remember what bugid
> it was that the fix was attached to for 3.5.x that
> caused this error ?

I think it was #8915.

> 
> Oh - the same comma is present in the v3-6-test git
> tree I think !
> 
> This is a must-fix before 3.5.next or 3.6.next release,
> as :
> 
> parm_opt = iniparser_getstring,(ctx->dict, key, NULL);
> 
> compiles, but doesn't do what the programmer expects :-).
> 
> Cheers,
> 
>         Jeremy
Comment 4 Karolin Seeger 2012-05-26 20:13:02 UTC
Pushed to v3-5-test and v3-6-test.
Closing out bug report.

Thanks a lot for catching this one, Jeremy!