more merging
authorAndrew Tridgell <tridge@samba.org>
Wed, 10 May 2000 09:49:55 +0000 (09:49 +0000)
committerAndrew Tridgell <tridge@samba.org>
Wed, 10 May 2000 09:49:55 +0000 (09:49 +0000)
commitddc9b8b40642c90fe7c34b088eae4f8075f4033a
tree56c378815bdf109d13b1d4e5b51f0e1ea313a58d
parent6cf96ff43155346589e19c1bb2fd723be74f1f12
more merging

it is now at the stage that winbindd can compile in the head branch,
but not link
(This used to be commit d178c00aae77710ae6ff20a7f54a30e3bd8232bb)
13 files changed:
source3/Makefile.in
source3/include/ntdomain.h
source3/include/nterr.h
source3/include/proto.h
source3/include/rpc_secdes.h
source3/include/sids.h [new file with mode: 0644]
source3/libsmb/clierror.c
source3/libsmb/nterr.c
source3/nmbd/nmbd.c
source3/nsswitch/winbindd_util.c
source3/param/loadparm.c
source3/rpc_parse/parse_sec.c
source3/smbd/server.c