--- samba-2.2.8/source/lib/util_unistr.c	Tue Dec 10 15:58:15 2002
+++ samba-2.2.8/source/lib/util_unistr.c	Thu May 15 18:02:42 2003
@@ -940,7 +940,7 @@
 		dest_len=MAXUNI-3;
 
 	if (flags & STR_TERMINATE) 
-		src_len = strlen_w(src)*2+2;
+		src_len = ( src == NULL ? 0 :  strlen_w(src)*2+2 );
 
 	dest_len = MIN((src_len/2), (dest_len-1));
 	unistr_to_ascii(dest, src, dest_len);
--- samba-2.2.8/source/rpc_server/srv_spoolss_nt.c	Fri Mar 14 22:34 49 2003
+++ samba-2.2.8/source/rpc_server/srv_spoolss_nt.c	Thu May 15 15:50:42 2003
@@ -6656,20 +6656,20 @@
 		goto done;
 	}
 
-	/* BEGIN_ADMIN_LOG */
+	/* BEGIN_ADMIN_LOG
         switch(level) {
 	    case 3:
 		sys_adminlog(LOG_INFO,"Added printer driver. Print driver name: %s. Print driver OS: %s. Administrator name: %s.",
 			driver.info_3->name,drv_ver_to_os[driver.info_3->cversion],uidtoname(user.uid));
 		fstrcpy(driver_name, driver.info_3->name);
 		break;
 	    case 6:   
 		sys_adminlog(LOG_INFO,"Added printer driver. Print driver name: %s. Print driver OS: %s. Administrator name: %s.",
 			driver.info_6->name,drv_ver_to_os[driver.info_6->version],uidtoname(user.uid));
 		fstrcpy(driver_name, driver.info_6->name);
 		break;
         }
-	/* END_ADMIN_LOG */
+	END_ADMIN_LOG */
 
 	/* 
 	 * I think this is where he DrvUpgradePrinter() hook would be