Merge commit 'origin/master' into libcli-auth-merge-without-netlogond
authorAndrew Bartlett <abartlet@samba.org>
Mon, 20 Apr 2009 14:53:02 +0000 (16:53 +0200)
committerAndrew Bartlett <abartlet@samba.org>
Mon, 20 Apr 2009 14:53:02 +0000 (16:53 +0200)
commit6c9caed48187a0d18becf59ab636af44cbe521b0
treec47170169077be6f8ae60aed739803ab4ba861b7
parent53765c81f726a8c056cc4e57004592dd489975c9
parent31120c9eacafd93e0f2c6b0f906af21adadd318a
Merge commit 'origin/master' into libcli-auth-merge-without-netlogond
source3/include/proto.h
source3/libnet/libnet_join.c
source3/libsmb/cliconnect.c
source3/rpc_server/srv_samr_nt.c
source3/utils/net_rpc.c
source3/utils/net_rpc_join.c
source4/torture/rpc/samr.c