svn commit: samba r16941 - branches/SAMBA_3_0/source/nsswitch trunk/source/nsswitch

[gd at samba.org]

Author: gd
Date: 2006-07-11 10:39:32 +0000 (Tue, 11 Jul 2006)
New Revision: 16941

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16941

Log:
Fix crash bug when the pam conversation receives an empty token.
Thanks to Bjoern Jacke for the report and test-case.

Guenther

Modified:
   branches/SAMBA_3_0/source/nsswitch/pam_winbind.c
   trunk/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-07-11 09:59:22 UTC (rev 16940)
+++ branches/SAMBA_3_0/source/nsswitch/pam_winbind.c	2006-07-11 10:39:32 UTC (rev 16941)
@@ -748,8 +748,8 @@
 						}
 					}
 				} else {
-					_pam_log(LOG_NOTICE
-						 ,"could not recover authentication token");
+					_pam_log(LOG_NOTICE, "could not recover authentication token");
+					retval = PAM_AUTHTOK_RECOVER_ERR;
 				}
 
 			}

Modified: trunk/source/nsswitch/pam_winbind.c
===================================================================
--- trunk/source/nsswitch/pam_winbind.c	2006-07-11 09:59:22 UTC (rev 16940)
+++ trunk/source/nsswitch/pam_winbind.c	2006-07-11 10:39:32 UTC (rev 16941)
@@ -766,8 +766,8 @@
 						}
 					}
 				} else {
-					_pam_log(LOG_NOTICE
-						 ,"could not recover authentication token");
+					_pam_log(LOG_NOTICE, "could not recover authentication token");
+					retval = PAM_AUTHTOK_RECOVER_ERR;
 				}
 
 			}