[SCM] Samba Shared Repository - branch v3-3-stable updated -
release-3-3-0pre2-235-g6c7b05a
Karolin Seeger
kseeger at samba.org
Thu Nov 20 09:23:20 GMT 2008
The branch, v3-3-stable has been updated
via 6c7b05acf7ec731b91a5717f89a229bcdb1e94f4 (commit)
via 716a9385dc5c01116b63ab593c0dc0b00beaa145 (commit)
via 36cb1752924e344a833d3426255daf0823c18b33 (commit)
via fd8d1696b794a7c4ae6a4030ac178fe27024a42d (commit)
via 733fbfc37b2cdfb7f3bc5074376aae26d8768e1b (commit)
via 396ebc009a99460744b565498cec219d4ba0c382 (commit)
via 4712e2be0e275bde0596e01062e917407dba9c97 (commit)
via a4099928bbbd3260155b933636f752966a586179 (commit)
via 3916ac337db1651766979491812866fa4c1d30be (commit)
via bc65ed40a378b265d7b301282028aa1c2eec68c3 (commit)
via 1382871a3b5935f594204a51920e358e95db3978 (commit)
via 764fd6ef04beb12144eb4cfbb5248d65b135dafc (commit)
via a30a228af76aab4e6d4550fd52a47a41f9363483 (commit)
via 9336c8193e4b56136d0c188ec999f2e322f30f77 (commit)
via 222877ed948f4dd9d3930ada8e9c59effc6cb538 (commit)
via 89453ff68ede00a49ea27459ed19f1991b215af4 (commit)
via a735f85b30abf8e033a9c333927303efc0094f43 (commit)
via fa33c5627628bbd9eef633235b1eb144915da1d2 (commit)
via 786b068c1926efc80f79ed7469c1b2e5eab23665 (commit)
via ef44fe374e641b5f6434c13d0bfab9a485f055ed (commit)
via 7849aebea6a270801043cb907047b3060f3fd64f (commit)
via 40758398dda0e85eae90db45ba72531ed61fd4fe (commit)
via b9446cf84459cba551757938254f32193d733f07 (commit)
via e1caea89d7826c1aa2d03f2e300e12efef434093 (commit)
via 436022bed43a36e6bb39c58012492528e949f1ba (commit)
via 4110eadf89879220242fe85d2fb092d63e51bb80 (commit)
via 02293bd8aee070411626c0b5a32d6bf3d7423976 (commit)
via b2647dbfed31f977704ea8b2024b74e1ecd17ec0 (commit)
via 8563e75e8c67d46a1240d5cff58b09fd069081a5 (commit)
via f3c8305884d430f41c1727f3f90701e1c8a1a3b2 (commit)
via 229185a604338cb7cce53b716c435e8c2885cc8a (commit)
via 734e615f4db3b1042a746b0ddb9ec81441ac5fb9 (commit)
via 85eddbb5b437155ff1b74e0ec3bdb58f3f478925 (commit)
via 3ed998e890aa29bc9811fa0d81fd726f94e33a57 (commit)
via 89131437899b2a268ead8b25402fe8e05fe59b5d (commit)
via 7dd9dc644a74e98f287187ba7f380082d6160b1c (commit)
via 490275ca8a7c3856117a199252de575fcfc26355 (commit)
via 84e0116490056c0457024f1028a84d979d1d74eb (commit)
via 7bf673751e0464878223807de3f65152132ff58f (commit)
via 5abc248ee7d5c31fb928bf396eea173af6e19e03 (commit)
via d56ce1176ea895e314688fb15d5cf3cd825536f2 (commit)
via 4e4607e86089d3035eae226b78a057dbecc2490a (commit)
via 9bf5451ef5cfbe96fab4fce858c6856996fe33d2 (commit)
via 504077e297341f2f1e69252932c2f75c0f59cf8f (commit)
via ea38a43b82e1d23beafeb183f4ec595cc3e5923b (commit)
via 870aaba206066fae20c8181c04fd0d6bc92b6a4c (commit)
via 2b16c54a134de9fbbc977741ff50746390550e00 (commit)
via 9307f9d5f69fbd8143c859afa242d08e09e66f56 (commit)
via ff87a80f58486f8e9a060a94f51be27f6114ac63 (commit)
via 45b2ff522eb3d4c71efada451ffca4d53d6fef7d (commit)
via ee22580fe97e62f4a9095ce8098551eb06f4c7fb (commit)
via 19418e7d5479b6a21fb5b5490a4967334b1df94d (commit)
via 2e200a381f58ac3a86dd7497ef9d633a1aea55b5 (commit)
via 49ed121e50f14623b99751ab2956b6e125cf4335 (commit)
via f4a9ce78b66258ff78d3545e0e854c80d2f6aa6d (commit)
via 97840db09c9f6e918c0ac0ab09da1c800ff81b34 (commit)
via 606bffd321a0465cf7963a45566a71a4941ee9a5 (commit)
via bde3801947a70ecafeecff0d43337489f717b4f2 (commit)
via 610b580accdef72efbf618527f6bf981bbac382c (commit)
via a98d8d7e4f71288fc383621123130aec48428b86 (commit)
via fd851fcd3bc492585a6220ef062f9188deefd00e (commit)
via b607c1a8e3c7b1e21d90530115268c216b06d238 (commit)
via 569b9981ad3553ba33f527c9ec65cff3fecae8c2 (commit)
via 5901855d778adca7c9e28922f304e190e62cf402 (commit)
from 30175a22b7f979cffc0cb839159189d2ed7f2bb7 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-3-stable
- Log -----------------------------------------------------------------
commit 6c7b05acf7ec731b91a5717f89a229bcdb1e94f4
Author: Karolin Seeger <kseeger at samba.org>
Date: Thu Nov 20 10:22:09 2008 +0100
WHATSNEW: Update changes since 3.3.0pre2.
Karolin
(cherry picked from commit e543bcc4e9da7c6e4cbfab7082a09eaefb48ed6b)
commit 716a9385dc5c01116b63ab593c0dc0b00beaa145
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 16:48:03 2008 -0800
This code mixes up int and uint32 when pulling out of a TDB. This is very bad. Fixing... May fix bug #5891, not sure.
Jeremy.
(cherry picked from commit 01c03b8c618ad1ae19dc72e0f254779b0569adeb)
commit 36cb1752924e344a833d3426255daf0823c18b33
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 13 17:19:11 2008 +0100
s3-winbindd: workaround for samr_ChangePasswordUser3 to User2 fallback for w2k dcs.
Guenther
(cherry picked from commit c9f57fa84a33572b4888dd01688760eb34971a51)
commit fd8d1696b794a7c4ae6a4030ac178fe27024a42d
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 12:25:16 2008 -0800
Add functions to delete NTACL on posix ACL set.
Jeremy.
(cherry picked from commit 0c4d1d187bb93e65c7de38071cf54e8554b150b9)
commit 733fbfc37b2cdfb7f3bc5074376aae26d8768e1b
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 16:44:29 2008 +0200
s3-docs: fix typos in locator manpage found by metze.
Guenther
(cherry picked from commit ae1abe843a349d55eb8d606f79a7753804a82547)
(cherry picked from commit 66937b060ad54e9b6633abb35c2956b546c1bba1)
commit 396ebc009a99460744b565498cec219d4ba0c382
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 23 16:40:23 2008 +0200
s3-docs: add very basic winbind_krb5_locator.7 manpage.
Guenther
(cherry picked from commit 90d3cac55f12b34f69f8f366b044dc6382a1a153)
(cherry picked from commit 78b28c15515bed295c7853d4294ea4f1838a3f9d)
commit 4712e2be0e275bde0596e01062e917407dba9c97
Author: Jeremy Allison <jra at samba.org>
Date: Wed Nov 19 11:22:00 2008 -0800
Fix bug #5904 - libnss_wins causes SIGABRT while servicing getaddrinfo() request.
Jeremy.
(cherry picked from commit 543e5ff596e69aa14576ae2dfa6d37fa7247fe28)
commit a4099928bbbd3260155b933636f752966a586179
Author: Günther Deschner <gd at samba.org>
Date: Fri Oct 10 15:13:14 2008 +0200
libwbclient: fix wbcAuthenticateUserEx() to not ignore provided flags field.
Guenther
(cherry picked from commit 08d3918cf8773f1a3f67a82123ebe006ea581e4e)
(cherry picked from commit 309f02b20f8a83508eb639889058993fede34bc4)
commit 3916ac337db1651766979491812866fa4c1d30be
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Nov 19 13:16:38 2008 +0100
build-docs: Use 'git clean' instead of 'git-clean'.
Karolin
(cherry picked from commit 12e72140b944f844e7f44f21a087ab4a4ecc51a7)
(cherry picked from commit f13c2da16d62c9279a84c4a2da1b52c7b6d38fac)
commit bc65ed40a378b265d7b301282028aa1c2eec68c3
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Nov 19 13:08:41 2008 +0100
manpages: Document new wbinfo idmapping options.
--set-uid/gid-mapping
--remove-uid/gid-mapping
Karolin
(cherry picked from commit c9965d544f615fea1ba3609d7348407130ab1ec9)
commit 1382871a3b5935f594204a51920e358e95db3978
Author: Karolin Seeger <kseeger at samba.org>
Date: Wed Nov 19 13:08:00 2008 +0100
WHATSNEW: Update changes since 3.3.0pre2.
Karolin
(cherry picked from commit 88d2c5a8a4b770f2bdd70fa7c58733d572d619f1)
commit 764fd6ef04beb12144eb4cfbb5248d65b135dafc
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Mon Oct 27 23:36:36 2008 -0700
[PATCH] Clean-up various trailing space and >80 column lines.
(cherry picked from commit b72335fc9771ec815f3a32b6e0d9f5fb9faebc18)
commit a30a228af76aab4e6d4550fd52a47a41f9363483
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Mon Oct 27 23:37:55 2008 -0700
[PATCH] Added ability to remove id mappings in wbinfo and libwbclient.
The idmap_tdb backend already provides an interface to remove existing id
mappings. This commit plumbs that ability up through, winbindd, libwbclient,
and wbinfo.
Added new winbindd command:
WINBINDD_REMOVE_MAPPING
Added new libwbclient interfaces:
wbcRemoveUidMapping() and wbcRemoveGidMapping()
Added new wbinfo options:
--remove-uid-mapping
--remove-gid-mapping
Increased libwbclient version to 0.2
Increased winbind interface version to 20
(cherry picked from commit 2ebab00716509617f1980beacee09c85b6b13b91)
commit 9336c8193e4b56136d0c188ec999f2e322f30f77
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Mon Oct 27 23:46:44 2008 -0700
[PATCH] Added ability to set id mappings in wbinfo.
The two new parameters are:
--set-uid-mapping
--set-gid-mapping
These allow wbinfo to create new, or override existing id mappings in the
idmap backend. These expose the exisiting ability of libwbclient
and winbindd to do this, up through a command line utility.
(cherry picked from commit c32dff226aa08dcbd1961bcafa61c0fdff3ecebc)
commit 222877ed948f4dd9d3930ada8e9c59effc6cb538
Author: Günther Deschner <gd at samba.org>
Date: Sun Sep 21 18:57:26 2008 +0200
netlogon: move password change code out to rpccli_netlogon_set_trust_password.
Guenther
(cherry picked from commit 9f168f594e25857bd71bbc97dab25ae6d2884e95)
commit 89453ff68ede00a49ea27459ed19f1991b215af4
Author: Günther Deschner <gd at samba.org>
Date: Sat Sep 20 18:20:29 2008 +0200
netlogon: refactor just_change_the_password a bit.
Guenther
(cherry picked from commit 6690cd1e8f2a77dda1bf5ee453ef98856b1a3233)
commit a735f85b30abf8e033a9c333927303efc0094f43
Author: Günther Deschner <gd at samba.org>
Date: Sat Sep 20 17:01:20 2008 +0200
netlogon: use init_netr_CryptPassword in "just_change_the_password"
Guenther
(cherry picked from commit 004b8be2d7630f910bda08df9c361a5f289b7c34)
commit fa33c5627628bbd9eef633235b1eb144915da1d2
Author: Günther Deschner <gd at samba.org>
Date: Sat Sep 20 17:00:30 2008 +0200
netlogon: add init_netr_CryptPassword.
Guenther
(cherry picked from commit 90d0328bd7b7cb841aafd65ad0af36182ba692ee)
commit 786b068c1926efc80f79ed7469c1b2e5eab23665
Author: Günther Deschner <gd at samba.org>
Date: Wed Nov 19 02:07:35 2008 +0100
netlogon: change parameters string to lsa_BinaryString.
Guenther
(cherry picked from commit d10490248f387a55fa6ff712dd5cb092434ddeb4)
commit ef44fe374e641b5f6434c13d0bfab9a485f055ed
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 10 12:32:26 2008 +0100
s3-netlogon: fix type of parameters string in user delta.
Guenther
(cherry picked from commit 0d23b13370db9d4ab0a3c81fca4a28e15802fe68)
commit 7849aebea6a270801043cb907047b3060f3fd64f
Author: Günther Deschner <gd at samba.org>
Date: Sat Sep 27 03:29:01 2008 +0200
wbclient: add wbcLookupDomainControllerEx call.
Guenther
(cherry picked from commit 10c20f2beb2da17cff94e4beb5a228a07a276be1)
commit 40758398dda0e85eae90db45ba72531ed61fd4fe
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 2 13:11:31 2008 +0200
wbclient: add wbcGuidToString and wbcStringToGuid helper functions.
Guenther
(cherry picked from commit 162af045bb616da6e9864a121dee91c21d67d86b)
commit b9446cf84459cba551757938254f32193d733f07
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 2 13:06:50 2008 +0200
wbclient: add wbcGuid structure.
Guenther
(cherry picked from commit 46942bad3818750c027eae62480e88b8cfa54875)
commit e1caea89d7826c1aa2d03f2e300e12efef434093
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 2 13:07:14 2008 +0200
wbclient: add my copyright.
Guenther
(cherry picked from commit 5d105f89f087dacd4eb52c0efe4795faf1037c2b)
commit 436022bed43a36e6bb39c58012492528e949f1ba
Author: Günther Deschner <gd at samba.org>
Date: Sat Sep 27 03:11:59 2008 +0200
krb5-locator: fix dsgetdcname caller.
Guenther
(cherry picked from commit ecafae21667f3b2a30cd5d0d5fc68bb01c7ef811)
commit 4110eadf89879220242fe85d2fb092d63e51bb80
Author: Günther Deschner <gd at samba.org>
Date: Sat Sep 27 03:11:33 2008 +0200
wbinfo: fix dsgetdcname caller.
Guenther
(cherry picked from commit 2003edbc309d64ad76e1b924b3b5290ddd198104)
commit 02293bd8aee070411626c0b5a32d6bf3d7423976
Author: Günther Deschner <gd at samba.org>
Date: Sat Sep 27 03:05:47 2008 +0200
s3-winbindd: add dsgetdcname request and reply to winbind structure.
Guenther
(cherry picked from commit b445624f6d28bd269ffb2b4db26343659fdd9390)
commit b2647dbfed31f977704ea8b2024b74e1ecd17ec0
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 09:52:35 2008 +0100
s3-libnet-samsync: store samsync sequence number state in keytab.
Guenther
(cherry picked from commit e96bcb7c2a49f95dee2a50adb1ed3ba77b1cbe07)
commit 8563e75e8c67d46a1240d5cff58b09fd069081a5
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 09:49:37 2008 +0100
s3-libnet-samsync: refactor libnet_samsync.
Guenther
(cherry picked from commit a5f3bbbef1cdee91562e6f497cb612be78af7dd2)
commit f3c8305884d430f41c1727f3f90701e1c8a1a3b2
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 09:42:59 2008 +0100
s3-libnet-samsync: pass back sequence number from fetch_sam_entries_keytab.
Guenther
(cherry picked from commit 59b58d79af5aea62a6b7e60eb4b34141fd4d6356)
commit 229185a604338cb7cce53b716c435e8c2885cc8a
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 03:45:38 2008 +0100
s3-libnet-samsync: use netr_DatabaseDeltas unless full replication enforced.
Guenther
(cherry picked from commit a8fdca6963c4028ea8c65110945e78291f19031a)
commit 734e615f4db3b1042a746b0ddb9ec81441ac5fb9
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 02:01:03 2008 +0100
s3-libnet-samsync: pass sequence number pointer to process routine.
Guenther
(cherry picked from commit 7ab18764a88cb4ff555ce21b50d58a19ba47d540)
commit 85eddbb5b437155ff1b74e0ec3bdb58f3f478925
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 17 19:34:56 2008 +0100
s3-libnet-samsync: move all modules to startup,process,finish callbacks.
Guenther
(cherry picked from commit 1f239e17dd43667507b6b49006c9fe61c2cda289)
commit 3ed998e890aa29bc9811fa0d81fd726f94e33a57
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 17 17:14:19 2008 +0100
s3-libnet-samsync: call init and close ops function where appropriate.
Guenther
(cherry picked from commit c0c5dfbe4a305e18af69f094a25062cb222b7fd1)
commit 89131437899b2a268ead8b25402fe8e05fe59b5d
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 17 16:31:59 2008 +0100
s3-libnet-samsync: use samsync_ops.
Guenther
(cherry picked from commit 8aa7b1e4d8706bddb6da1b455f16484ca35fc17e)
commit 7dd9dc644a74e98f287187ba7f380082d6160b1c
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 17 16:29:11 2008 +0100
s3-libnet-samsync: add samsync_ops to all samsync modules.
Guenther
(cherry picked from commit eee6e2039b476c5bc257b1987335e250fd002e5c)
commit 490275ca8a7c3856117a199252de575fcfc26355
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 17 16:28:34 2008 +0100
s3-libnet-samsync: add samsync_ops.
Guenther
(cherry picked from commit 34eb55b9a8c83c739c1e3f540515e435b2b1a365)
commit 84e0116490056c0457024f1028a84d979d1d74eb
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 01:16:53 2008 +0100
s3-libnet: move add_to_keytab_entries to libnet_keytab.
Guenther
(cherry picked from commit 919f03a1755e6865a4d0edbdc50168355c03f346)
commit 7bf673751e0464878223807de3f65152132ff58f
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 13:25:50 2008 +0100
s3-net: add "net rpc vampire passdb" that allows to take arguments.
Guenther
(cherry picked from commit fa381aa868ffd87f7d00b652163ffb50b6a967db)
commit 5abc248ee7d5c31fb928bf396eea173af6e19e03
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 11 19:00:26 2008 +0100
s3-net: use net_scan_dc in net rpc vampire keytab.
Guenther
(cherry picked from commit 2e6387771660a6b0e253decc269952bc5b80c477)
commit d56ce1176ea895e314688fb15d5cf3cd825536f2
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 11 18:59:57 2008 +0100
s3-net: add net_scan_dc function.
Guenther
(cherry picked from commit 4f954d550368e50e94b1f71fb9c151e393b06e6b)
commit 4e4607e86089d3035eae226b78a057dbecc2490a
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 11 18:59:21 2008 +0100
s3-net: add net_dc_info struct.
Guenther
(cherry picked from commit 65baa109ecf7a108fef471fa481bc91800c3f916)
commit 9bf5451ef5cfbe96fab4fce858c6856996fe33d2
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 4 16:25:40 2008 +0100
s3-net-vampire: add support for partial replication (individual deltas).
Guenther
(cherry picked from commit 1c5a1843bd3e430c0e1c5a30d8995e8e43611809)
commit 504077e297341f2f1e69252932c2f75c0f59cf8f
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 4 15:49:27 2008 +0100
s3-libnet-samsync: add support for partial replication.
Guenther
(cherry picked from commit 8889173e7dbc7fb56e854640e60baae0c7477fa2)
commit ea38a43b82e1d23beafeb183f4ec595cc3e5923b
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 23:50:02 2008 +0100
re-run make idl.
Guenther
(cherry picked from commit 65b06a53d5fb82780363bbece04fb3e477d6c136)
commit 870aaba206066fae20c8181c04fd0d6bc92b6a4c
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 6 16:50:39 2008 +0100
netlogon: use 8bit SamDatabaseID and DeltaEnum in netr_ChangeLogEntry.
Guenther
(cherry picked from commit 19f795312cc2e0e96bd447e84c9c996a5438bbe3)
commit 2b16c54a134de9fbbc977741ff50746390550e00
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 23:43:09 2008 +0100
netlogon: add 8bit varients of netr_SamDatabaseID8Bit and netr_DeltaEnum.
Guenther
(cherry picked from commit 31f8238bcffa95cfeec078cae2c24b23df6eeb27)
commit 9307f9d5f69fbd8143c859afa242d08e09e66f56
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 4 11:35:48 2008 +0100
netlogon-idl: use netr_ChangeLogEntry subcontext in netr_DatabaseRedo.
Guenther
(cherry picked from commit 545849a208e0026f83ba6edc3515ccdbd9d74684)
commit ff87a80f58486f8e9a060a94f51be27f6114ac63
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 4 11:34:35 2008 +0100
netlogon-idl: add netr_ChangeLogObject union.
Guenther
(cherry picked from commit 65f9b7c4a550a48daf42e5666defd5222a20fd27)
commit 45b2ff522eb3d4c71efada451ffca4d53d6fef7d
Author: Günther Deschner <gd at samba.org>
Date: Mon Nov 3 13:38:20 2008 +0100
netlogon-idl: add netr_ChangeLogFlags.
Guenther
(cherry picked from commit bf1e5f5c58059ce468ab89a1dd069a96376284a3)
commit ee22580fe97e62f4a9095ce8098551eb06f4c7fb
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 30 10:54:25 2008 +0100
netlogon-idl: add netr_ChangeLogEntry.
Guenther
(cherry picked from commit 95a5092ab672f55ccfa183bf9b989a215273b6b8)
commit 19418e7d5479b6a21fb5b5490a4967334b1df94d
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 30 09:29:17 2008 +0100
netlogon: fix IDL for netr_DatabaseRedo.
Guenther
(cherry picked from commit bea4ca30cb2fdcb72331a2f3648006b3d21e3407)
commit 2e200a381f58ac3a86dd7497ef9d633a1aea55b5
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Sat Nov 15 13:07:15 2008 -0800
Fix extended DN parse error when AD object does not have a SID.
Some AD objects, like Exchange Public Folders, can be members of Security
Groups but do not have a SID attribute. This patch adds more granular return
errors to ads_get_sid_from_extended_dn(). Callers can now determine if a parse
error occured because of bad input, or the DN was valid but contained no SID.
I updated all callers to ignore SIDless objects when appropriate.
Also did some cleanup to the out paths of lookup_usergroups_memberof()
(cherry picked from commit c9b3bbdc3c36580dcb18a99ac58ae143b1926d8e)
commit 49ed121e50f14623b99751ab2956b6e125cf4335
Author: Steven Danneman <steven.danneman at isilon.com>
Date: Fri Nov 14 19:16:12 2008 -0800
Whitespace and >80 column cleanups.
(cherry picked from commit f778c89592b5884c2d572c31dac3ccc14ac10dfb)
commit f4a9ce78b66258ff78d3545e0e854c80d2f6aa6d
Author: Günther Deschner <gd at samba.org>
Date: Tue Oct 14 13:36:15 2008 +0200
s3-build: fix init_samba_module missing proto warning.
Guenther
(cherry picked from commit f4f59bf24803df975ed38d558c7b0931ca575c3d)
(cherry picked from commit 39f47db6f93132ebeef185f064652944aec11d99)
commit 97840db09c9f6e918c0ac0ab09da1c800ff81b34
Author: Michael Adam <obnox at samba.org>
Date: Mon Sep 22 10:34:57 2008 +0200
winbind_util: fix an implicit cast compile warning.
Michael
(cherry picked from commit d7fa7b88d5027903a1dace366e41aab19c0b95d4)
commit 606bffd321a0465cf7963a45566a71a4941ee9a5
Author: Günther Deschner <gd at samba.org>
Date: Thu Nov 13 19:42:13 2008 +0100
s3-svctl-server: fix remote rpc service management (bug #5888).
Don't TALLOC_FREE a non-talloced [ref] pointer.
Guenther
(cherry picked from commit dd53e2faa4a0a9944947f0720960270954b2a5e7)
commit bde3801947a70ecafeecff0d43337489f717b4f2
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 16 02:00:46 2008 +0200
s3: remove old marshalling for SVCCTL_QUERY_SERVICE_CONFIG.
Guenther
(cherry picked from commit 3523c08f3f9298dd4cc4a3f46e0ac56547f21e34)
commit 610b580accdef72efbf618527f6bf981bbac382c
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 16 01:35:27 2008 +0200
s3: remove rpccli_svcctl_query_config.
Guenther
(cherry picked from commit f9aaf834a44d3717f0dc9f8b8794b711847c4cf9)
commit a98d8d7e4f71288fc383621123130aec48428b86
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 18:01:00 2008 +0100
s3: use IDL generated rpc for _svcctl_QueryServiceConfigW.
Guenther
(cherry picked from commit 84edcdc61b1f17c8424facb8c7f02514619aec2a)
commit fd851fcd3bc492585a6220ef062f9188deefd00e
Author: Günther Deschner <gd at samba.org>
Date: Tue Nov 18 19:27:35 2008 +0100
s3: re-run make idl.
Guenther
(cherry picked from commit c18dd2bd1cf9ffd30b692bcccbcdebd7db14a1ff)
commit b607c1a8e3c7b1e21d90530115268c216b06d238
Author: Günther Deschner <gd at samba.org>
Date: Thu Oct 16 01:21:46 2008 +0200
idl: fix svcctl_QueryServiceConfigW.
Guenther
(cherry picked from commit d50ca802dac4ef274c6e36e758b3638db5b6f88d)
commit 569b9981ad3553ba33f527c9ec65cff3fecae8c2
Author: Dina Fine <dina at exanet.com>
Date: Tue Nov 18 12:44:42 2008 -0800
Fix bug #5908 - Samba 3.0.32 - internal change notify on share directory fails"
(cherry picked from commit fb838504e4626d2bbb37a48591e5965d76c44f72)
commit 5901855d778adca7c9e28922f304e190e62cf402
Author: Kai Blin <kai at samba.org>
Date: Tue Nov 18 16:31:34 2008 +0100
libsmb: Fix up pointer passed to cli_send_trans in cli_link_internal
Seems like this one fell victim to the pstring removal. The other callers seem
to be fine, even though removing the casts would make the code less confusing.
(cherry picked from commit f9ecc1971b78b7ffc2d5c1a47ff7265916003bfd)
-----------------------------------------------------------------------
Summary of changes:
WHATSNEW.txt | 13 +-
docs-xml/manpages-3/wbinfo.1.xml | 27 +++
docs-xml/manpages-3/winbind_krb5_locator.7.xml | 95 ++++++++
release-scripts/build-docs | 2 +-
source/Makefile.in | 4 +-
source/include/module.h | 1 +
source/include/proto.h | 24 ++-
source/include/rpc_svcctl.h | 26 ---
source/libads/ldap.c | 78 ++++---
source/libnet/libnet_dssync_keytab.c | 111 ++++------
source/libnet/libnet_keytab.c | 33 +++
source/libnet/libnet_proto.h | 7 +
source/libnet/libnet_samsync.c | 200 ++++++++++++++---
source/libnet/libnet_samsync.h | 65 ++++---
source/libnet/libnet_samsync_display.c | 17 +-
source/libnet/libnet_samsync_keytab.c | 221 ++++++++++++++-----
source/libnet/libnet_samsync_ldif.c | 119 +++++++---
source/libnet/libnet_samsync_passdb.c | 20 +-
source/librpc/gen_ndr/cli_netlogon.c | 8 +-
source/librpc/gen_ndr/cli_netlogon.h | 8 +-
source/librpc/gen_ndr/cli_svcctl.c | 8 +-
source/librpc/gen_ndr/cli_svcctl.h | 6 +-
source/librpc/gen_ndr/misc.h | 3 +
source/librpc/gen_ndr/ndr_netlogon.c | 285 ++++++++++++++++++++----
source/librpc/gen_ndr/ndr_netlogon.h | 7 +
source/librpc/gen_ndr/ndr_svcctl.c | 237 +++++++++++++++++++-
source/librpc/gen_ndr/ndr_svcctl.h | 4 +
source/librpc/gen_ndr/netlogon.h | 35 +++-
source/librpc/gen_ndr/srv_netlogon.c | 2 +-
source/librpc/gen_ndr/srv_svcctl.c | 2 +-
source/librpc/gen_ndr/svcctl.h | 18 ++-
source/librpc/idl/misc.idl | 3 +
source/librpc/idl/netlogon.idl | 38 +++-
source/librpc/idl/svcctl.idl | 19 ++-
source/librpc/ndr/ndr_netlogon.c | 64 ++++++
source/librpc/ndr/ndr_netlogon.h | 28 +++
source/libsmb/clifile.c | 2 +-
source/libsmb/trusts_util.c | 108 +---------
source/modules/vfs_acl_tdb.c | 212 +++++++++++-------
source/modules/vfs_acl_xattr.c | 50 ++++
source/nsswitch/libwbclient/wbc_guid.c | 118 ++++++++++
source/nsswitch/libwbclient/wbc_idmap.c | 86 +++++++
source/nsswitch/libwbclient/wbc_pam.c | 6 +
source/nsswitch/libwbclient/wbc_util.c | 139 ++++++++++++
source/nsswitch/libwbclient/wbclient.c | 2 +-
source/nsswitch/libwbclient/wbclient.h | 57 +++++-
source/nsswitch/wb_common.c | 2 +-
source/nsswitch/wbinfo.c | 195 ++++++++++++++++-
source/nsswitch/winbind_krb5_locator.c | 27 ++-
source/nsswitch/winbind_struct_protocol.h | 25 ++-
source/nsswitch/wins.c | 63 ++++--
source/rpc_client/cli_netlogon.c | 91 ++++++++
source/rpc_client/cli_svcctl.c | 76 -------
source/rpc_client/init_netlogon.c | 17 ++
source/rpc_parse/parse_svcctl.c | 116 ----------
source/rpc_server/srv_eventlog_lib.c | 42 ++--
source/rpc_server/srv_eventlog_nt.c | 8 +-
source/rpc_server/srv_svcctl.c | 18 +--
source/rpc_server/srv_svcctl_nt.c | 40 ++--
source/smbd/notify.c | 3 +
source/utils/net.h | 10 +
source/utils/net_proto.h | 5 +
source/utils/net_rpc.c | 8 +
source/utils/net_rpc_samsync.c | 165 +++++++++++++-
source/utils/net_rpc_service.c | 49 +++--
source/utils/net_util.c | 38 +++
source/winbindd/idmap.c | 17 ++
source/winbindd/idmap_tdb.c | 63 ++++--
source/winbindd/winbindd.c | 3 +-
source/winbindd/winbindd_ads.c | 125 ++++++-----
source/winbindd/winbindd_group.c | 4 +-
source/winbindd/winbindd_idmap.c | 63 ++++++
source/winbindd/winbindd_pam.c | 6 +
source/winbindd/winbindd_proto.h | 6 +
source/winbindd/winbindd_sid.c | 45 ++++-
source/winbindd/winbindd_util.c | 2 +-
76 files changed, 2989 insertions(+), 961 deletions(-)
create mode 100644 docs-xml/manpages-3/winbind_krb5_locator.7.xml
create mode 100644 source/librpc/ndr/ndr_netlogon.c
create mode 100644 source/librpc/ndr/ndr_netlogon.h
create mode 100644 source/nsswitch/libwbclient/wbc_guid.c
Changeset truncated at 500 lines:
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index fe0ce0a..bb70a13 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -28,6 +28,7 @@ Major enhancements in Samba 3.3.0 include:
daemons including nmbd and winbindd.
o New 'net rpc vampire keytab' and 'net rpc vampire ldif' commands.
o The 'net' utility can now use kerberos for joining and authentication.
+ o The 'wbinfo' utility can now add, modify and remove identity mapping entries.
Libraries:
o NetApi library implements various new calls for User- and Group
@@ -185,6 +186,8 @@ o Jeremy Allison <jra at samba.org>
* BUG 5891: Fix smbd crash when viewing the eventlog exported by "eventlog
list".
* BUG 5900: Fix vfs_readonly.
+ * BUG 5904: Fix SIGABRT while servicing getaddrinfo() request caused by
+ libnss_wins.
* Correctly fix smbclient to terminate on eof from server.
* Fix client timeout when searching for a large number of cups printers.
* Unify access checks for lsa server functions.
@@ -205,8 +208,12 @@ o Gerald (Jerry) Carter <jerry at samba.org>
* Make "lwinet ads dns register" honor the "interfaces" parameter.
+o Steven Danneman <steven.danneman at isilon.com>
+ * Add options to manage identity mapping entries to wbinfo and Winbind.
+
+
o Günther Deschner <gd at samba.org>
- * BUG 5888: Fix PNP_GetHwProfInfo().
+ * BUG 5888: Fix remote rpc service management.
* Ensure consistency when reporting password complexity.
* Fix _lsa_GetUserName.
* Fix access check in _samr_QuerySecurity().
@@ -215,6 +222,10 @@ o Günther Deschner <gd at samba.org>
* Fix numerous netapi issues.
+o Dina Fine <dina at exanet.com>
+ * BUG 5908: Fix internal change notify on share directories.
+
+
o Jeff Layton <jlayton at redhat.com>
* Have uppercase_string return success on NULL pointer in mount.cifs.
* Make mount.cifs return codes match the return codes for /bin/mount.
diff --git a/docs-xml/manpages-3/wbinfo.1.xml b/docs-xml/manpages-3/wbinfo.1.xml
index e08347c..1fb7206 100644
--- a/docs-xml/manpages-3/wbinfo.1.xml
+++ b/docs-xml/manpages-3/wbinfo.1.xml
@@ -39,10 +39,14 @@
<arg choice="opt">--own-domain</arg>
<arg choice="opt">-p</arg>
<arg choice="opt">-r user</arg>
+ <arg choice="opt">--remove-uid-mapping uid,sid</arg>
+ <arg choice="opt">--remove-gid-mapping gid,sid</arg>
<arg choice="opt">-s sid</arg>
<arg choice="opt">--separator</arg>
<arg choice="opt">--sequence</arg>
<arg choice="opt">--set-auth-user user%password</arg>
+ <arg choice="opt">--set-uid-mapping uid,sid</arg>
+ <arg choice="opt">--set-gid-mapping gid,sid</arg>
<arg choice="opt">-S sid</arg>
<arg choice="opt">-t</arg>
<arg choice="opt">-u</arg>
@@ -328,6 +332,29 @@
the operation will fail. </para></listitem>
</varlistentry>
+ <varlistentry>
+ <term>--remove-uid-mapping uid,sid</term>
+ <listitem><para>Remove an existing uid to sid mapping
+ entry from the IDmap backend.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--remove-gid-mapping gid,sid</term>
+ <listitem><para>Remove an existing gid to sid
+ mapping entry from the IDmap backend.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--set-uid-mapping uid,sid</term>
+ <listitem><para>Create a new or modify an existing uid to sid
+ mapping in the IDmap backend.</para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>--set-gid-mapping gid,sid</term>
+ <listitem><para>Create a new or modify an existing gid to sid
+ mapping in the IDmap backend.</para></listitem>
+ </varlistentry>
&stdarg.version;
&stdarg.help;
diff --git a/docs-xml/manpages-3/winbind_krb5_locator.7.xml b/docs-xml/manpages-3/winbind_krb5_locator.7.xml
new file mode 100644
index 0000000..b828116
--- /dev/null
+++ b/docs-xml/manpages-3/winbind_krb5_locator.7.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<refentry id="winbind_krb5_locator.7">
+
+<refmeta>
+ <refentrytitle>winbind_krb5_locator</refentrytitle>
+ <manvolnum>7</manvolnum>
+ <refmiscinfo class="source">Samba</refmiscinfo>
+ <refmiscinfo class="manual">7</refmiscinfo>
+ <refmiscinfo class="version">3.3</refmiscinfo>
+</refmeta>
+
+
+<refnamediv>
+ <refname>winbind_krb5_locator</refname>
+ <refpurpose>A plugin for MIT and Heimdal Kerberos for detecting KDCs using Windows semantics.</refpurpose>
+</refnamediv>
+
+
+<refsect1>
+ <title>DESCRIPTION</title>
+
+ <para>
+ This plugin is part of the <citerefentry><refentrytitle>samba</refentrytitle>
+ <manvolnum>7</manvolnum></citerefentry> suite.
+ </para>
+
+ <para>
+ <command>winbind_krb5_locator</command> is a plugin that permits MIT and
+ Heimdal Kerberos libraries to detect Kerberos Servers (for the KDC and
+ kpasswd service) using the same semantics that other tools of the Samba
+ suite use. This include site-aware DNS service record lookups and caching
+ of closest dc.
+ The plugin uses the public locator API provided by most modern Kerberos
+ implementations.
+ </para>
+</refsect1>
+<refsect1>
+ <title>PREREQUISITES</title>
+ <para>
+ MIT Kerberos (at least version 1.5) or Heimdal Kerberos (at least version
+ 1.0) is required.
+ </para>
+
+ <para>
+ The plugin queries the <citerefentry><refentrytitle>winbindd</refentrytitle>
+ <manvolnum>8</manvolnum></citerefentry> daemon which needs to be configured
+ and started separately.
+ </para>
+
+ <para>
+ The <command>winbind_krb5_locator.so</command> file needs to be manually
+ copied to the plugin directory of the system Kerberos library.
+
+ For MIT Kerberos this is often:
+ <filename>/usr/lib/krb5/plugins/libkrb5/</filename>.
+ For Heimdal Kerberos this is often:
+ <filename>/usr/lib/plugin/krb5/</filename>.
+
+ Please check your local Kerberos installation for the correct
+ paths. No modification in <filename>/etc/krb5.conf</filename>
+ is required to enable the use of this plugin.
+ </para>
+ <para>
+ After copying the locator plugin to the appropriate plugin
+ directory it should immediately be available for use.
+ Users should be able to kinit into their kerberized Windows
+ environment without any modification or servers
+ being put manually into <filename>/etc/krb5.conf</filename>.
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>VERSION</title>
+
+ <para>
+ This man page is correct for version 3 of the Samba suite.
+ </para>
+</refsect1>
+
+<refsect1>
+ <title>AUTHOR</title>
+
+ <para>
+ The original Samba software and related utilities were created by Andrew
+ Tridgell. Samba is now developed by the Samba Team as an Open Source
+ project similar to the way the Linux kernel is developed.
+ </para>
+
+ <para>
+ The winbind_krb5_locator manpage was written by Guenther Deschner.
+ </para>
+</refsect1>
+
+</refentry>
diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index 53500d7..357b4e9 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -4,7 +4,7 @@ DOCSRCDIR=`dirname $0`/../docs-xml
cd $DOCSRCDIR || exit 1
-git-clean -d -x -f
+git clean -d -x -f
autoconf && \
./configure --with-papersize=letter && \
make smbdotconf/parameters.all.xml && \
diff --git a/source/Makefile.in b/source/Makefile.in
index 9df43e6..685c688 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -280,7 +280,8 @@ RPCCLIENT_NDR_OBJ = rpc_client/ndr.o
LIBNDR_GEN_OBJ0 = librpc/gen_ndr/ndr_samr.o \
librpc/gen_ndr/ndr_lsa.o
-LIBNDR_GEN_OBJ1 = librpc/gen_ndr/ndr_netlogon.o
+LIBNDR_GEN_OBJ1 = librpc/gen_ndr/ndr_netlogon.o \
+ librpc/ndr/ndr_netlogon.o
LIBNDR_GEN_OBJ = librpc/gen_ndr/ndr_wkssvc.o \
$(LIBNDR_GEN_OBJ0) \
@@ -1730,6 +1731,7 @@ LIBWBCLIENT_OBJ0 = nsswitch/libwbclient/wbclient.o \
nsswitch/libwbclient/wbc_pwd.o \
nsswitch/libwbclient/wbc_idmap.o \
nsswitch/libwbclient/wbc_sid.o \
+ nsswitch/libwbclient/wbc_guid.o \
nsswitch/libwbclient/wbc_pam.o
LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
$(WBCOMMON_OBJ) \
diff --git a/source/include/module.h b/source/include/module.h
index 20dbaba..52245e0 100644
--- a/source/include/module.h
+++ b/source/include/module.h
@@ -23,6 +23,7 @@
/* Module support */
typedef NTSTATUS (init_module_function) (void);
+NTSTATUS init_samba_module(void);
typedef int smb_event_id_t;
#define SMB_EVENT_ID_INVALID (-1)
diff --git a/source/include/proto.h b/source/include/proto.h
index 3e3ddd4..a147ae5 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -2102,10 +2102,10 @@ ADS_STATUS ads_get_joinable_ous(ADS_STRUCT *ads,
TALLOC_CTX *mem_ctx,
char ***ous,
size_t *num_ous);
-bool ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
- const char *extended_dn,
- enum ads_extended_dn_flags flags,
- DOM_SID *sid);
+ADS_STATUS ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
+ const char *extended_dn,
+ enum ads_extended_dn_flags flags,
+ DOM_SID *sid);
char* ads_get_dnshostname( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
char* ads_get_upn( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
char* ads_get_samaccountname( ADS_STRUCT *ads, TALLOC_CTX *ctx, const char *machine_name );
@@ -7045,6 +7045,12 @@ NTSTATUS rpccli_netlogon_sam_network_logon_ex(struct rpc_pipe_client *cli,
DATA_BLOB lm_response,
DATA_BLOB nt_response,
struct netr_SamInfo3 **info3);
+NTSTATUS rpccli_netlogon_set_trust_password(struct rpc_pipe_client *cli,
+ TALLOC_CTX *mem_ctx,
+ const unsigned char orig_trust_passwd_hash[16],
+ const char *new_trust_pwd_cleartext,
+ const unsigned char new_trust_passwd_hash[16],
+ uint32_t sec_channel_type);
/* The following definitions come from rpc_client/cli_pipe.c */
@@ -7309,8 +7315,6 @@ WERROR rpccli_spoolss_rffpcnex(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
WERROR rpccli_svcctl_enumerate_services( struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
POLICY_HND *hSCM, uint32 type, uint32 state,
uint32 *returned, ENUM_SERVICES_STATUS **service_array );
-WERROR rpccli_svcctl_query_config(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx,
- POLICY_HND *hService, SERVICE_CONFIG *config );
/* The following definitions come from rpc_client/init_lsa.c */
@@ -7423,6 +7427,9 @@ void init_netr_PasswordInfo(struct netr_PasswordInfo *r,
const char *workstation,
struct samr_Password lmpassword,
struct samr_Password ntpassword);
+void init_netr_CryptPassword(const char *pwd,
+ unsigned char session_key[16],
+ struct netr_CryptPassword *pwd_buf);
/* The following definitions come from rpc_client/init_samr.c */
@@ -8298,11 +8305,8 @@ bool convert_port_data_1( NT_PORT_DATA_1 *port1, RPC_BUFFER *buf ) ;
bool svcctl_io_enum_services_status( const char *desc, ENUM_SERVICES_STATUS *enum_status, RPC_BUFFER *buffer, int depth );
bool svcctl_io_service_status_process( const char *desc, SERVICE_STATUS_PROCESS *status, RPC_BUFFER *buffer, int depth );
uint32 svcctl_sizeof_enum_services_status( ENUM_SERVICES_STATUS *status );
-uint32 svcctl_sizeof_service_config( SERVICE_CONFIG *config );
bool svcctl_io_q_enum_services_status(const char *desc, SVCCTL_Q_ENUM_SERVICES_STATUS *q_u, prs_struct *ps, int depth);
bool svcctl_io_r_enum_services_status(const char *desc, SVCCTL_R_ENUM_SERVICES_STATUS *r_u, prs_struct *ps, int depth);
-bool svcctl_io_q_query_service_config(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG *q_u, prs_struct *ps, int depth);
-bool svcctl_io_r_query_service_config(const char *desc, SVCCTL_R_QUERY_SERVICE_CONFIG *r_u, prs_struct *ps, int depth);
bool svcctl_io_q_query_service_config2(const char *desc, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, prs_struct *ps, int depth);
void init_service_description_buffer(SERVICE_DESCRIPTION *desc, const char *service_desc );
bool svcctl_io_service_description( const char *desc, SERVICE_DESCRIPTION *description, RPC_BUFFER *buffer, int depth );
@@ -9238,7 +9242,6 @@ WERROR _svcctl_ControlService(pipes_struct *p,
WERROR _svcctl_EnumDependentServicesW(pipes_struct *p,
struct svcctl_EnumDependentServicesW *r);
WERROR _svcctl_query_service_status_ex( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_STATUSEX *q_u, SVCCTL_R_QUERY_SERVICE_STATUSEX *r_u );
-WERROR _svcctl_query_service_config( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CONFIG *q_u, SVCCTL_R_QUERY_SERVICE_CONFIG *r_u );
WERROR _svcctl_query_service_config2( pipes_struct *p, SVCCTL_Q_QUERY_SERVICE_CONFIG2 *q_u, SVCCTL_R_QUERY_SERVICE_CONFIG2 *r_u );
WERROR _svcctl_LockServiceDatabase(pipes_struct *p,
struct svcctl_LockServiceDatabase *r);
@@ -10512,6 +10515,7 @@ NTSTATUS idmap_backends_sid_to_unixid(const char *domname,
NTSTATUS idmap_new_mapping(const struct dom_sid *psid, enum id_type type,
struct unixid *pxid);
NTSTATUS idmap_set_mapping(const struct id_map *map);
+NTSTATUS idmap_remove_mapping(const struct id_map *map);
/* The following definitions come from winbindd/idmap_cache.c */
diff --git a/source/include/rpc_svcctl.h b/source/include/rpc_svcctl.h
index aa1d166..0e31a53 100644
--- a/source/include/rpc_svcctl.h
+++ b/source/include/rpc_svcctl.h
@@ -142,18 +142,6 @@ typedef struct {
} ENUM_SERVICES_STATUS;
typedef struct {
- uint32 service_type;
- uint32 start_type;
- uint32 error_control;
- UNISTR2 *executablepath;
- UNISTR2 *loadordergroup;
- uint32 tag_id;
- UNISTR2 *dependencies;
- UNISTR2 *startname;
- UNISTR2 *displayname;
-} SERVICE_CONFIG;
-
-typedef struct {
uint32 unknown;
UNISTR description;
} SERVICE_DESCRIPTION;
@@ -216,20 +204,6 @@ typedef struct {
typedef struct {
POLICY_HND handle;
- uint32 buffer_size;
-} SVCCTL_Q_QUERY_SERVICE_CONFIG;
-
-typedef struct {
- SERVICE_CONFIG config;
- uint32 needed;
- WERROR status;
-} SVCCTL_R_QUERY_SERVICE_CONFIG;
-
-
-/**************************/
-
-typedef struct {
- POLICY_HND handle;
uint32 level;
uint32 buffer_size;
} SVCCTL_Q_QUERY_SERVICE_CONFIG2;
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 03d02fc..97e802a 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -3111,60 +3111,66 @@ ADS_STATUS ads_get_joinable_ous(ADS_STRUCT *ads,
/**
* pull a DOM_SID from an extended dn string
- * @param mem_ctx TALLOC_CTX
+ * @param mem_ctx TALLOC_CTX
* @param extended_dn string
* @param flags string type of extended_dn
* @param sid pointer to a DOM_SID
- * @return boolean inidicating success
+ * @return NT_STATUS_OK on success,
+ * NT_INVALID_PARAMETER on error,
+ * NT_STATUS_NOT_FOUND if no SID present
**/
-bool ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
- const char *extended_dn,
- enum ads_extended_dn_flags flags,
- DOM_SID *sid)
+ADS_STATUS ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
+ const char *extended_dn,
+ enum ads_extended_dn_flags flags,
+ DOM_SID *sid)
{
char *p, *q, *dn;
if (!extended_dn) {
- return False;
+ return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
/* otherwise extended_dn gets stripped off */
if ((dn = talloc_strdup(mem_ctx, extended_dn)) == NULL) {
- return False;
+ return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
- /*
+ /*
* ADS_EXTENDED_DN_HEX_STRING:
* <GUID=238e1963cb390f4bb032ba0105525a29>;<SID=010500000000000515000000bb68c8fd6b61b427572eb04556040000>;CN=gd,OU=berlin,OU=suse,DC=ber,DC=suse,DC=de
*
* ADS_EXTENDED_DN_STRING (only with w2k3):
- <GUID=63198e23-39cb-4b0f-b032-ba0105525a29>;<SID=S-1-5-21-4257769659-666132843-1169174103-1110>;CN=gd,OU=berlin,OU=suse,DC=ber,DC=suse,DC=de
+ * <GUID=63198e23-39cb-4b0f-b032-ba0105525a29>;<SID=S-1-5-21-4257769659-666132843-1169174103-1110>;CN=gd,OU=berlin,OU=suse,DC=ber,DC=suse,DC=de
+ *
+ * Object with no SID, such as an Exchange Public Folder
+ * <GUID=28907fb4bdf6854993e7f0a10b504e7c>;CN=public,CN=Microsoft Exchange System Objects,DC=sd2k3ms,DC=west,DC=isilon,DC=com
*/
p = strchr(dn, ';');
if (!p) {
- return False;
+ return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
if (strncmp(p, ";<SID=", strlen(";<SID=")) != 0) {
- return False;
+ DEBUG(5,("No SID present in extended dn\n"));
+ return ADS_ERROR_NT(NT_STATUS_NOT_FOUND);
}
p += strlen(";<SID=");
q = strchr(p, '>');
if (!q) {
- return False;
+ return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
-
+
*q = '\0';
DEBUG(100,("ads_get_sid_from_extended_dn: sid string is %s\n", p));
switch (flags) {
-
+
case ADS_EXTENDED_DN_STRING:
if (!string_to_sid(sid, p)) {
- return False;
+ return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
break;
case ADS_EXTENDED_DN_HEX_STRING: {
@@ -3173,21 +3179,21 @@ bool ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
buf_len = strhex_to_str(buf, sizeof(buf), p, strlen(p));
if (buf_len == 0) {
- return False;
+ return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
if (!sid_parse(buf, buf_len, sid)) {
DEBUG(10,("failed to parse sid\n"));
- return False;
+ return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
break;
}
default:
DEBUG(10,("unknown extended dn format\n"));
- return False;
+ return ADS_ERROR_NT(NT_STATUS_INVALID_PARAMETER);
}
- return True;
+ return ADS_ERROR_NT(NT_STATUS_OK);
}
/**
@@ -3200,18 +3206,19 @@ bool ads_get_sid_from_extended_dn(TALLOC_CTX *mem_ctx,
* @param sids pointer to sid array to allocate
* @return the count of SIDs pulled
**/
- int ads_pull_sids_from_extendeddn(ADS_STRUCT *ads,
- TALLOC_CTX *mem_ctx,
- LDAPMessage *msg,
+ int ads_pull_sids_from_extendeddn(ADS_STRUCT *ads,
+ TALLOC_CTX *mem_ctx,
+ LDAPMessage *msg,
const char *field,
enum ads_extended_dn_flags flags,
DOM_SID **sids)
{
int i;
- size_t dn_count;
+ ADS_STATUS rc;
+ size_t dn_count, ret_count = 0;
char **dn_strings;
- if ((dn_strings = ads_pull_strings(ads, mem_ctx, msg, field,
--
Samba Shared Repository
More information about the samba-cvs
mailing list