1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
samba-mirror/source4/nsswitch
Jelmer Vernooij b5d84a74d1 Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:

	source/auth/credentials/config.mk
	source/auth/gensec/config.mk
	source/build/smb_build/makefile.pm
	source/heimdal_build/config.mk
	source/lib/events/config.mk
	source/lib/nss_wrapper/config.mk
	source/lib/policy/config.mk
	source/lib/registry/config.mk
	source/lib/socket_wrapper/config.mk
	source/lib/tdb/config.mk
	source/lib/tls/config.mk
	source/lib/util/config.mk
	source/libcli/config.mk
	source/libcli/ldap/config.mk
	source/libnet/config.mk
	source/librpc/config.mk
	source/param/config.mk
	source/rpc_server/config.mk
	source/scripting/ejs/config.mk
	source/smbd/process_model.mk
(This used to be commit 760378e029)
2008-04-08 03:45:06 +02:00
..
config.m4 Merge v4.0-test 2008-03-28 00:44:14 +01:00
config.mk Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3 2008-04-08 03:45:06 +02:00
nsstest.c r25027: Fix more warnings. 2007-10-10 15:05:41 -05:00
nsstest.h r23792: convert Samba4 to GPLv3 2007-10-10 14:59:12 -05:00
nsstest.m4 r23481: As per metze's suggestion, move the nsstest files from torture/ to nsswitch/ 2007-10-10 14:53:19 -05:00
wb_common.c r25181: sync winbind client code with samba3 2007-10-10 15:06:46 -05:00
wbinfo.c Remove more uses of global_loadparm. 2008-02-21 15:45:32 +01:00
winbind_client.h r25181: sync winbind client code with samba3 2007-10-10 15:06:46 -05:00
winbind_nss_config.h r25181: sync winbind client code with samba3 2007-10-10 15:06:46 -05:00
winbind_nss_hpux.h r23800: LGPL is now called GNU Lesser General Public License 2007-10-10 14:59:17 -05:00
winbind_nss_irix.h r25181: sync winbind client code with samba3 2007-10-10 15:06:46 -05:00
winbind_nss_linux.c r25181: sync winbind client code with samba3 2007-10-10 15:06:46 -05:00
winbind_nss_linux.h r23800: LGPL is now called GNU Lesser General Public License 2007-10-10 14:59:17 -05:00
winbind_nss_solaris.h r25192: try to fix the build on sun/solaris hosts 2007-10-10 15:06:49 -05:00
winbind_nss.h r25181: sync winbind client code with samba3 2007-10-10 15:06:46 -05:00
winbind_struct_protocol.h r26515: nsswitch: Get rid of a pstring 2007-12-21 05:51:19 +01:00