Age | Commit message (Collapse) | Author | Files | Lines |
|
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)
|
|
(This used to be commit 6ac6de8476ba036eb041e054bc37e4503dc2fde8)
|
|
(This used to be commit d45c6b5574ea732d25e9180c83f1fa807ebe57ba)
|
|
(This used to be commit 92c1c0e9137f0845cac6cc96bf78711b6aaffe21)
|
|
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)
|
|
(This used to be commit 0e1d0a874ae3d22b8f97a79b81fe0af3ef53a771)
|
|
(This used to be commit 269cbf84d8b7dbf3bc88adc04ae283dc908af5ac)
|
|
(This used to be commit a43f6d37bce85748e9cf2675e5beced5db26f1c3)
|
|
(This used to be commit 33111f98df7e8f9bb7d62599c6b13a1a4479a2e1)
|
|
(This used to be commit bc0fab89e325ebb6ab870b1c3f4b263c50631b70)
|
|
(This used to be commit 4b9d5bc57ca4ee14c142ea720dce5e4ee97f8c16)
|
|
(This used to be commit 8b33860954ca03be1ea45fd8d40963dbbd5b162f)
|
|
(This used to be commit bd0ef811c4e6419ba05076fbc151827cea5d1ca1)
|
|
(This used to be commit 7911308dbc1233838e44c533302f77b03ea41148)
|
|
(This used to be commit c474a2bb83a3e28a0b83f3b8ca1b646742dfca3d)
|
|
This code is no longer used, and equivalent code already exists in Python
(scripting/python/samba/samba3.py)
(This used to be commit c16212e8bf5343496ea4b3afc30a8b4d3a0afe2d)
|
|
(This used to be commit eb04de69c0e319e18b148191946808f81e1cc8c4)
|
|
(This used to be commit 35f5c8294e9f3b304987597d4bcfc75fdda05982)
|
|
Spotted by nobody88 in IRC.
(This used to be commit 38d4e2407afb942de21379dc886f9e4c5532a2b9)
|
|
(This used to be commit ea07509b4a9335a3b3fe6f6da1124fd1aab33c96)
|
|
(This used to be commit 239a1616644321e2d1e64985ea3f3c4971997228)
|
|
(This used to be commit 7777611c0f32a693f0fa057c130e4ea491658f6b)
|
|
(This used to be commit 64d6d729135e1b3b19c9bdbbe973fcdaca15e8b3)
|
|
(This used to be commit 80dbf04266d15833f7eb18704cfece1f95965e83)
|
|
(This used to be commit b874f07175ae38a041f53f0e4ac6a4050dcefeae)
|
|
(This used to be commit 073ed0dd1cc8fae9eb4a2f7ff6763124917c56e8)
|
|
documentation.
(This used to be commit 68f13d87eb034fdbc712169f2d1b1a0475751ec5)
|
|
(This used to be commit ed44fd59bfa289bcef82e0650ccda381efb52268)
|
|
(This used to be commit 361b9f43fb2abb64f2cbae7740b89a616a3c2646)
|
|
(This used to be commit b173fa6bd2b24b5a3e7b4fbcb926f6c9771c10ba)
|
|
(This used to be commit 4eec2bbc9a139e927ce21c615ebfbb3026b26384)
|
|
(This used to be commit 373ef4287f998b79bf9ba6364d6a67e5c522833d)
|
|
Conflicts:
source/scripting/python/samba/provision.py
(This used to be commit e367df5d994181f08ad1a20a0ce01991ca30bcc8)
|
|
Andrew Bartlett
(This used to be commit 8f0a89ca19d6a3986dacd981fab1ebbc8b1a4ad0)
|
|
We were still setting the hard-coded users.ldb etc, rather than
switching to the ldapi:// URI
Andrew Bartlett
(This used to be commit 603e981250b26b533ec35dd607cb635226cf99df)
|
|
(This used to be commit 73d1b0fcb64fdc7be1e1e1002f3f182fcbe476ae)
|
|
<node>.<pid>.<fd> to be unique in a prefork process environment.
Andrew Bartlett and David Disseldorp
(This used to be commit 931994a7f185bbc98924823e9e8cef1011dd0957)
|
|
(This used to be commit 421bdd203eab09e560f4919715fa4cc4497e406f)
|
|
351c2e99ab8b6a91f7355077b2d2944fd820839c to see if that fixes the build.
(This used to be commit 2a79cebfd99f4048214be65a6c918cc988dc83ed)
|
|
(This used to be commit 079200b824de6dd8c7de3e5b76ed1805fde02965)
|
|
(This used to be commit 41571bbb933c763a9608f4ba56f1a5a97af133ab)
|
|
metze
(This used to be commit 351c2e99ab8b6a91f7355077b2d2944fd820839c)
|
|
(This used to be commit f3ebaf0a0c0b881da28063c69bb6306f6aa1c774)
|
|
Conflicts:
source/scripting/python/samba/provision.py
(This used to be commit 64babbec22f165e34799d36ff4b76806d9fead50)
|
|
Pair programmed with Andrew.
(This used to be commit 04fe8c8aefae8da8966954d0654c37adf2d0361d)
|
|
with Jelmer today.
The only remaining issue is that for the build farm, we will need to
manually specify the users and groups from the NSS_WRAPPPER, as python
isn't compiled with this.
Andrew Bartlett
(This used to be commit 5370484d25b8c7a5bde730d9be36ecbbb0aaf315)
|
|
binary blobs, fix escaping of LDAP URL's in PHP LDAP admin configuration.
Pair-programmed with Andrew, but git doesn't appear to support multiple --author arguments. :-(
(This used to be commit dff54ff043563f93b86361039c46e662045f62cc)
|
|
(This used to be commit 9173c678efb6f74dbec64298bcb00952feff2ed7)
|
|
(This used to be commit 859cffed9d3a62f9f7610d74472aa3c0d1979a35)
|
|
provisioning, some other minor refactoring of the provisioning.
Pair-programmed by Andrew and me using obby :-)
(This used to be commit 688adcbb635af87fcfedb869b7f1857a947fd2f9)
|