Typo in fix that went into 3.5.x and 3.6.x breaks pam_winbind.

Jeremy Allison jra at samba.org
Fri May 25 18:16:06 MDT 2012


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


More information about the samba-technical mailing list