more merging voodoo
authorAndrew Tridgell <tridge@samba.org>
Wed, 10 May 2000 10:41:59 +0000 (10:41 +0000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 10 May 2000 10:41:59 +0000 (10:41 +0000)
commit92109d7b3c06f240452d39f669ecb8c9c86ab610
tree9fe3157a8fab623da9b462ec8ce708bbefc7e12f
parentd178c00aae77710ae6ff20a7f54a30e3bd8232bb
more merging voodoo

this adds "#define OLD_NTDOMAIN 1" in lots of places. Don't panic -
this isn't permanent, it should go after another few merge steps have
been done
38 files changed:
source/include/proto.h
source/lib/msrpc_use.c
source/nsswitch/winbindd_util.c
source/printing/printfsp.c
source/rpc_server/srv_lsa.c
source/rpc_server/srv_lsa_hnd.c
source/rpc_server/srv_netlog.c
source/rpc_server/srv_pipe_hnd.c
source/rpc_server/srv_reg.c
source/rpc_server/srv_spoolss.c
source/rpc_server/srv_srvsvc.c
source/rpc_server/srv_util.c
source/rpc_server/srv_wkssvc.c
source/smbd/blocking.c
source/smbd/chgpasswd.c
source/smbd/close.c
source/smbd/conn.c
source/smbd/dir.c
source/smbd/dosmode.c
source/smbd/error.c
source/smbd/fileio.c
source/smbd/filename.c
source/smbd/files.c
source/smbd/ipc.c
source/smbd/lanman.c
source/smbd/message.c
source/smbd/negprot.c
source/smbd/nttrans.c
source/smbd/open.c
source/smbd/oplock.c
source/smbd/password.c
source/smbd/pipes.c
source/smbd/process.c
source/smbd/reply.c
source/smbd/server.c
source/smbd/service.c
source/smbd/trans2.c
source/smbd/uid.c