Author: gd Date: 2006-12-18 22:10:09 +0000 (Mon, 18 Dec 2006) New Revision: 20249
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20249 Log: Fail when parsing invalid options in _pam_parse. Guenther Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c branches/SAMBA_3_0_24/source/nsswitch/pam_winbind.c Changeset: Modified: branches/SAMBA_3_0/source/nsswitch/pam_winbind.c =================================================================== --- branches/SAMBA_3_0/source/nsswitch/pam_winbind.c 2006-12-18 22:01:39 UTC (rev 20248) +++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c 2006-12-18 22:10:09 UTC (rev 20249) @@ -174,7 +174,8 @@ else if (!strcasecmp(*v, "cached_login")) ctrl |= WINBIND_CACHED_LOGIN; else { - _pam_log(pamh, ctrl, LOG_ERR, "pam_parse: unknown option; %s", *v); + _pam_log(pamh, ctrl, LOG_ERR, "pam_parse: unknown option: %s", *v); + return -1; } } Modified: branches/SAMBA_3_0_24/source/nsswitch/pam_winbind.c =================================================================== --- branches/SAMBA_3_0_24/source/nsswitch/pam_winbind.c 2006-12-18 22:01:39 UTC (rev 20248) +++ branches/SAMBA_3_0_24/source/nsswitch/pam_winbind.c 2006-12-18 22:10:09 UTC (rev 20249) @@ -174,7 +174,8 @@ else if (!strcasecmp(*v, "cached_login")) ctrl |= WINBIND_CACHED_LOGIN; else { - _pam_log(pamh, ctrl, LOG_ERR, "pam_parse: unknown option; %s", *v); + _pam_log(pamh, ctrl, LOG_ERR, "pam_parse: unknown option: %s", *v); + return -1; } }
