svn commit: samba r13771 - branches/SAMBA_3_0/source/smbd trunk/source/smbd

[jerry at samba.org]

Author: jerry
Date: 2006-03-01 15:11:56 +0000 (Wed, 01 Mar 2006)
New Revision: 13771

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

Log:
BUG 3534: ignore lines in the username map file with no right hand list rather than bailing out
Modified:
   branches/SAMBA_3_0/source/smbd/map_username.c
   trunk/source/smbd/map_username.c


Changeset:
Modified: branches/SAMBA_3_0/source/smbd/map_username.c
===================================================================
--- branches/SAMBA_3_0/source/smbd/map_username.c	2006-03-01 15:02:07 UTC (rev 13770)
+++ branches/SAMBA_3_0/source/smbd/map_username.c	2006-03-01 15:11:56 UTC (rev 13771)
@@ -142,10 +142,12 @@
 			}
 		}
 
+		/* skip lines like 'user = ' */
+
 		dosuserlist = str_list_make(dosname, NULL);
 		if (!dosuserlist) {
-			DEBUG(0,("Unable to build user list\n"));
-			return False;
+			DEBUG(0,("Bad username map entry.  Unable to build user list.  Ignoring.\n"));
+			continue;
 		}
 
 		if (strchr_m(dosname,'*') ||

Modified: trunk/source/smbd/map_username.c
===================================================================
--- trunk/source/smbd/map_username.c	2006-03-01 15:02:07 UTC (rev 13770)
+++ trunk/source/smbd/map_username.c	2006-03-01 15:11:56 UTC (rev 13771)
@@ -142,10 +142,12 @@
 			}
 		}
 
+		/* skip lines like 'user = ' */
+
 		dosuserlist = str_list_make(dosname, NULL);
 		if (!dosuserlist) {
-			DEBUG(0,("Unable to build user list\n"));
-			return False;
+			DEBUG(0,("Bad username map entry.  Unable to build user list.  Ignoring.\n"));
+			continue;
 		}
 
 		if (strchr_m(dosname,'*') ||