svn commit: samba r1471 - in branches/tmp/SAMBA_3_2_MERGE/source: . client include lib lib/cmdline libcli/auth libsmb passdb printing rpc_parse sam web

[jerry at samba.org]

Author: jerry
Date: 2004-07-12 20:56:16 +0000 (Mon, 12 Jul 2004)
New Revision: 1471

Removed:
   branches/tmp/SAMBA_3_2_MERGE/source/include/genparser.h
   branches/tmp/SAMBA_3_2_MERGE/source/include/genparser_samba.h
   branches/tmp/SAMBA_3_2_MERGE/source/include/gums.h
   branches/tmp/SAMBA_3_2_MERGE/source/lib/genparser.c
   branches/tmp/SAMBA_3_2_MERGE/source/lib/genparser_samba.c
   branches/tmp/SAMBA_3_2_MERGE/source/passdb/pdb_gums.c
   branches/tmp/SAMBA_3_2_MERGE/source/sam/gums.c
   branches/tmp/SAMBA_3_2_MERGE/source/sam/gums_api.c
   branches/tmp/SAMBA_3_2_MERGE/source/sam/gums_helper.c
   branches/tmp/SAMBA_3_2_MERGE/source/sam/gums_tdbsam2.c
Modified:
   branches/tmp/SAMBA_3_2_MERGE/source/Makefile.in
   branches/tmp/SAMBA_3_2_MERGE/source/client/client.c
   branches/tmp/SAMBA_3_2_MERGE/source/client/clitar.c
   branches/tmp/SAMBA_3_2_MERGE/source/include/debug.h
   branches/tmp/SAMBA_3_2_MERGE/source/include/includes.h
   branches/tmp/SAMBA_3_2_MERGE/source/include/rpc_misc.h
   branches/tmp/SAMBA_3_2_MERGE/source/include/rpc_netlogon.h
   branches/tmp/SAMBA_3_2_MERGE/source/include/rpc_spoolss.h
   branches/tmp/SAMBA_3_2_MERGE/source/lib/cmdline/readline.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/auth/gensec.c
   branches/tmp/SAMBA_3_2_MERGE/source/libsmb/clikrb5.c
   branches/tmp/SAMBA_3_2_MERGE/source/printing/print_generic.c
   branches/tmp/SAMBA_3_2_MERGE/source/rpc_parse/parse_misc.c
   branches/tmp/SAMBA_3_2_MERGE/source/rpc_parse/parse_net.c
   branches/tmp/SAMBA_3_2_MERGE/source/rpc_parse/parse_samr.c
   branches/tmp/SAMBA_3_2_MERGE/source/rpc_parse/parse_spoolss.c
   branches/tmp/SAMBA_3_2_MERGE/source/web/cgi.c
   branches/tmp/SAMBA_3_2_MERGE/source/web/swat.c
Log:
more work on merge

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/tmp/SAMBA_3_2_MERGE/source&rev=1471&nolog=1