samba.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| \| *	No longer install unused smbscript binary.	Jelmer Vernooij	2008-04-09	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit ca0e373e57eb225a1f5d96813e9ea9ccee971b96)
\| \| * \|	Fix up provision to specify SERVERDN in more places.	Andrew Bartlett	2008-04-09	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Andrew Bartlett (This used to be commit d01d542502f25d6c731204ecb3d33720a1706581)
\| \| * \|	Don't fill in the secrets DB unless we make the entries.	Andrew Bartlett	2008-04-09	1	-7/+8
\| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Leave filling in (we still initialise it) the secrets DB for the join or vampire code. Andrew Bartlett (This used to be commit c93208c13ce91b334eadf0ea02fa41354e761e97)
\| \| *	Add docstring, PEP8.	Jelmer Vernooij	2008-04-09	1	-5/+15
\| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit f8cac3735c9a19baa313c4b61abee144da303ce1)
\| \| *	Remove length arguments, add tests for unixinfo.GidToSid and unixinfo.UidToSid.	Jelmer Vernooij	2008-04-08	2	-3/+9
\| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit cae61e32e5b61a02c2986b74bd1d7e58460b1e80)
\| \| *	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into pidldocs	Jelmer Vernooij	2008-04-08	1	-34/+50
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit c8dbf00b4490d804e1aac96a3fb66ff726bf9ef6)
\| \| \| *	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet	Andrew Bartlett	2008-04-08	3	-1/+34
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit c0416a0b73f06ef57db1b83a75433e36b93a9981)
\| \| \| * \|	Re-add support for the --ldap-backend-port option to provision-backend	Andrew Bartlett	2008-04-08	1	-13/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This option allows Fedora DS multi-master replication to work. I've tried to update the wiki and scripts to the largely consistant with each other. Andrew Bartlett (This used to be commit 42393c830733b2cc99ebccdafe944fcf3d82734f)
\| \| \| * \|	Clean up provision and rootdse module to hard-code less stuff.	Andrew Bartlett	2008-04-04	1	-21/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In particular, allow for the server DN to be in a different site (possible outcome of a DRS replication). Andrew Bartlett (This used to be commit 9ee4e39fe178317f42fd9a0adceea24b55dfe0f1)
\| \| * \| \|	Add manually written Python binding for libnet_Join.	Jelmer Vernooij	2008-04-08	1	-0/+1
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	(This used to be commit 374654b43d9f9e8381991cedc433ce410a914f7a)
\| * \| \|	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3	Jelmer Vernooij	2008-04-08	23	-129/+255
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 760378e0294dd0cd4523a83448328478632d7e3d)
\| \| * \|	Add trivial test for unixinfo interface.	Jelmer Vernooij	2008-04-08	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit b6b7171f70114bd27ca8db09964c65cacb9cea92)
\| \| * \|	Add python bindings for drsuapi.	Jelmer Vernooij	2008-04-08	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit ba3f0312f0dda47fb16ed9b8eee3750b209e0dad)
\| \| * \|	Add python bindings for unixinfo.	Jelmer Vernooij	2008-04-08	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 068c2f858a0c7e325cb8a1f2ca36e32b31fe1f77)
\| \| * \|	Add Python bindings for DFS.	Jelmer Vernooij	2008-04-08	1	-0/+1
\| \| \|/ \| \| \| \| \| \| \| \| \|	(This used to be commit 4319971ccb42618a3298a5f26f63fa4c9b255849)
\| * \|	Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-gmake3	Jelmer Vernooij	2008-03-28	2	-2/+2
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 71110c8e7d58f42312938d0a8d0b216cbc313885)
\| * \ \	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3	Jelmer Vernooij	2008-03-28	1	-2/+2
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 4e0b94d648e955b950c50d2ac19e17b06ee1f818)
\| * \ \ \	Merge v4.0-test	Jelmer Vernooij	2008-03-28	4	-215/+428
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 977dbdeaf363c8905ed9fd0570eba4be80582833)
\| * \| \| \| \|	Push SOVERSION and VERSION out of perl code.	Jelmer Vernooij	2008-03-08	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 0ba8ac6a14c62ff9edfe9f0bf43b8a7406b85291)
\| * \| \| \| \|	Fix the build.	Jelmer Vernooij	2008-03-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 3b7940d531a30098ca9a09e9c83dc4d223d1fe8f)
\| * \| \| \| \|	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3	Jelmer Vernooij	2008-03-07	3	-98/+183
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit e4da851bd7e7620bbf99efe20a496b1be78ba4e2)
\| * \| \| \| \| \|	Fix includes.	Jelmer Vernooij	2008-03-04	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 99e61dade2bd9ae2a5dfe17f766528012c09e46c)
\| * \| \| \| \| \|	Move object file lists to the Makefile.	Jelmer Vernooij	2008-03-03	3	-32/+48
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6)
\| * \| \| \| \| \|	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3	Jelmer Vernooij	2008-03-03	2	-10/+22
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: source/Makefile source/build/smb_build/makefile.pm source/librpc/config.mk (This used to be commit 3e02fcfd3fb6683f51417ba39f4ec177494eff3e)
\| * \ \ \ \ \ \	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3	Jelmer Vernooij	2008-02-29	13	-38/+38
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: source/scripting/python/config.mk (This used to be commit 0ac0ea660ab63eca764149f1d2828d0238a57289)
\| * \| \| \| \| \| \| \|	Fix pydoctor.	Jelmer Vernooij	2008-02-26	1	-5/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 023025e4de119aa234f885aa6e5594660bd8f358)
\| * \| \| \| \| \| \| \|	use make macro for python.	Jelmer Vernooij	2008-02-26	1	-27/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit b0408abb08648c0155d8f5da5fb299b1acbc09b6)
\| * \| \| \| \| \| \| \|	Fix the build (again).	Jelmer Vernooij	2008-02-26	1	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit ef00f6b5817107738dc44367838095896af4e77d)
\| * \| \| \| \| \| \| \|	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3	Jelmer Vernooij	2008-02-25	4	-3/+29
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: source/build/smb_build/header.pm source/build/smb_build/makefile.pm source/lib/ldb/include/ldb_private.h (This used to be commit 1a646af0647f021d99473a8991c35e616a423ea6)
\| * \ \ \ \ \ \ \ \	Merge branch 'v4-0-trivial' into v4-0-gmake3	Jelmer Vernooij	2008-02-18	1	-11/+11
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: source/build/smb_build/input.pm source/build/smb_build/main.pl source/build/smb_build/makefile.pm (This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
\| * \| \| \| \| \| \| \| \| \|	Move responsibilities of build.h to makefile.	Jelmer Vernooij	2008-02-16	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit a43f6d37bce85748e9cf2675e5beced5db26f1c3)
\| * \| \| \| \| \| \| \| \| \|	use gmake to handle .py file copies.	Jelmer Vernooij	2008-02-16	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 33111f98df7e8f9bb7d62599c6b13a1a4479a2e1)
* \| \| \| \| \| \| \| \| \| \|	More PEP8 compliancy.	Jelmer Vernooij	2008-04-06	1	-9/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit d16b30d005933c9cc73f9196a3b77829d23687a0)
* \| \| \| \| \| \| \| \| \| \|	Simplify some code, fix style.	Jelmer Vernooij	2008-04-05	1	-102/+99
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 1c983e4e4dfb93387791c36dc96696c4fffcfeb7)
* \| \| \| \| \| \| \| \| \| \|	Improve PEP8 (Python code style) compliancy a bit.	Jelmer Vernooij	2008-04-05	1	-6/+14
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit c7d388a6e2153234fe67daf1af094fc346e1da61)
* \| \| \| \| \| \| \| \| \|	provision: Remove backup group mapping	Kai Blin	2008-04-03	1	-10/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some distros seem to neither have a backup nor a staff group. (This used to be commit 21fcf7c419658b3ae296428ca7a4ccf2288c17fe)
* \| \| \| \| \| \| \| \| \|	provision: Set up id mappings in the idmap db, only map Administrator.	Kai Blin	2008-04-02	3	-70/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 206b7d387c6d17e5cc40fd45b489abac9235a7a4)
* \| \| \| \| \| \| \| \| \|	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange	Jelmer Vernooij	2008-04-02	1	-21/+30
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 8c3591d98f42a75d68d698f7b4be8f2e0284522f)
\| * \ \ \ \ \ \ \ \ \	Fix merge of my host GUID removal and the IPv6 addition to provision	Andrew Bartlett	2008-04-02	1	-10/+26
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'v4-0-ipv6' of git://git.id10ts.net/samba into 4-0-abartlet Andrew Bartlett (This used to be commit d3336684f084f984500dd0893dd01bcfc5be0ab1)
\| \| * \| \| \| \| \| \| \| \| \|	provision: Add support for IPv6 (bz #4593).	Andrew Kroeger	2008-04-01	1	-9/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 8585a3c77d5dfe97bca3f08716fc06ac2819f578)
\| * \| \| \| \| \| \| \| \| \| \|	Remove references to setting the host GUID, as the repl_meta_data	Andrew Bartlett	2008-04-02	1	-12/+5
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	module prohibits it anyway. Andrew Bartlett (This used to be commit c5b287c056855892f30fbbf32efe7d65da31ce91)
* \| \| \| \| \| \| \| \| \| \|	Install public header files again and include required prototypes.	Jelmer Vernooij	2008-04-02	3	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit 47ffbbf67435904754469544390b67d34c958343)
* \| \| \| \| \| \| \| \| \| \|	Rename libsamba-config to libsamba-hostconfig.	Jelmer Vernooij	2008-04-01	1	-1/+1
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit c46b7e90e347da76156ddcae4866adb88e9fec21)
* \| \| \| \| \| \| \| \| \|	Rework 'compleated' message in provision to be more useful.	Andrew Bartlett	2008-03-29	1	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In particular, this should draw attention to accidential 'standalone' server provisions and therefore cause less frustration. Andrew Bartlett (This used to be commit e906ae041a2b589ffceff97b74f7c4b01386382a)
* \| \| \| \| \| \| \| \| \|	Fix and test python scripts and kerberos	Andrew Bartlett	2008-03-28	2	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fixes up the python credentials interface in a number of areas, with the aim of supporting '-k yes' as a command line option. (This enables the use of kerberos). As such, I've had to change the get_credentials call to take a loadparm context, so that the credentials can be initialised correctly. The test_kinit script has been modified to prove that this continues to work, as well as to provide greater code coverage of the kerberos paths. Andrew Bartlett (This used to be commit 727ef40c2b56910028ef3c1092b8eab1bfa6ce63)
* \| \| \| \| \| \| \| \| \|	Convert some more files to GPLv3.	Andrew Kroeger	2008-03-28	11	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This used to be commit ebe5e8399422eb7e2ff4deb546338823e2718907)
* \| \| \| \| \| \| \| \| \|	Make the setup/newuser and setup/setpassword scripts actually work...	Andrew Bartlett	2008-03-28	1	-16/+42
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These need a testsuite, but this will come soon. Andrew Bartlett (This used to be commit fbcaa622bd1929399e32326349e96b6676a49b96)
* \| \| \| \| \| \| \| \| \|	Merge branch 'v4-0-local' of git://git.id10ts.net/samba into v4-0-test	Jelmer Vernooij	2008-03-28	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| / \| \| \|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \|	(This used to be commit b6c61bee649734f6000fbf3fe3736d8c82155ac9)
\| * \| \| \| \| \| \| \|	provision: Increase max NetBIOS name length from 13 to 15.	Andrew Kroeger	2008-03-27	2	-2/+2
\| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Issue originally reported by user Julsa-FR on IRC. (This used to be commit ee9ad77009ef5e36655a49c41730a4a963ba9d43)
* / \| \| \| \| \| \|	Don't specify what should be a default option in the generated smb.conf	Andrew Bartlett	2008-03-28	1	-2/+2
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead, sub in "", so that the default continued to come from the code. Andrew Bartlett (This used to be commit b1829da8f75175fcc569a3a9195f2358731055a9)