Date: Thu Jan 22 10:57:16 2004 Author: idra Update of /data/cvs/samba/source/passdb In directory dp.samba.org:/tmp/cvs-serv24793/passdb Modified Files: pdb_gums.c Log Message: sorry for the conflict markers committed in by mistake :-( Revisions: pdb_gums.c 1.5 => 1.6 http://www.samba.org/cgi-bin/cvsweb/samba/source/passdb/pdb_gums.c.diff?r1=1.5&r2=1.6