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)
commitd178c00aae77710ae6ff20a7f54a30e3bd8232bb
treea1f37e1534ab946409343478abbcbac6b23da022
parent5e04885b86791e6ef8b4a316e64d56c6eb05f35d
more merging

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