1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00
Commit Graph

2393 Commits

Author SHA1 Message Date
Günther Deschner
947e14adae s4-srvsvc: merge srvsvc_NetSessEnum from s3 idl.
Guenther
2008-10-31 02:44:33 +01:00
Günther Deschner
546fb4028a s4-srvsvc: merge srvsvc_NetFileEnum from s3 idl.
Guenther
2008-10-31 02:44:33 +01:00
Günther Deschner
8f99170ab9 s4-srvsvc: merge srvsvc_NetConnEnum from s3 idl.
Guenther
2008-10-31 02:44:33 +01:00
Günther Deschner
d1340df8b8 s4-srvsvc: merge srvsvc_NetCharDevQEnum from s3 idl.
Guenther
2008-10-31 02:44:33 +01:00
Günther Deschner
07f1bb3abc s4-srvsvc: merge srvsvc_NetCharDevEnum from s3 idl.
Guenther
2008-10-31 02:44:33 +01:00
Günther Deschner
439f197a68 s4-srvsvc: merge srvsvc_NetDiskEnum from s3 idl.
Guenther
2008-10-31 02:44:33 +01:00
Günther Deschner
7255209177 s4-srvsvc: merge srvsvc_NetFileGetInfo from s3 idl.
Guenther
2008-10-31 02:44:33 +01:00
Günther Deschner
b70d984f8f s4-srvsvc: merge srvsvc_NetCharDevQGetInfo from s3 idl.
Guenther
2008-10-31 02:44:32 +01:00
Günther Deschner
6e9d69e4c8 s4-srvsvc: merge srvsvc_NetCharDevGetInfo from s3 idl.
Guenther
2008-10-31 02:44:32 +01:00
Günther Deschner
c982b36930 s4-srvsvc: merge srvsvc_NetSrvGetInfo from s3 idl.
Guenther
2008-10-31 02:44:32 +01:00
Günther Deschner
5cd089edd2 s4-srvsvc: merge srvsvc_NetSrvSetInfo from s3 idl.
Guenther
2008-10-31 02:44:32 +01:00
Günther Deschner
d2cc4e63c5 s4-srvsvc: merge srvsvc_NetTransportEnum from s3 idl.
Guenther
2008-10-31 02:44:32 +01:00
Günther Deschner
8859e9a904 s4-srvsvc: merge srvsvc_NetTransportDel from s3 idl.
Guenther
2008-10-31 02:44:31 +01:00
Günther Deschner
227c6ed8ea s4-srvsvc: merge srvsvc_NetShareGetInfo from s3 idl.
Guenther
2008-10-31 02:44:31 +01:00
Günther Deschner
523732ed2d s4-srvsvc: merge srvsvc_NetShareSetInfo from s3 idl.
Guenther
2008-10-31 02:44:31 +01:00
Günther Deschner
3206f35527 s4-srvsvc: merge srvsvc_NetShareAdd from s3 idl.
Guenther
2008-10-31 02:44:31 +01:00
Günther Deschner
70c9cb4d9b s4-srvsvc: merge srvsvc_NetServerStatisticsGet from s3 idl.
Guenther
2008-10-31 02:44:31 +01:00
Günther Deschner
31b067a6dd s4-srvsvc: merge srvsvc_NetShareCheck from s3 idl.
Guenther
2008-10-31 02:44:30 +01:00
Günther Deschner
f151246e53 s4-srvsvc: merge srvsvc_NetPathType from s3 idl.
Guenther
2008-10-31 02:44:30 +01:00
Günther Deschner
0688173c27 s4-srvsvc: merge srvsvc_NetPathCanonicalize from s3 idl.
Guenther
2008-10-31 02:44:30 +01:00
Günther Deschner
9fd82703d1 s4-srvsvc: merge srvsvc_NetRemoteTOD from s3 idl.
Guenther
2008-10-31 02:44:30 +01:00
Günther Deschner
f61ce2fe41 s4-srvsvc: merge srvsvc_NetSetFileSecurity from s3 idl.
Guenther
2008-10-31 02:44:30 +01:00
Günther Deschner
95e438d9b3 s4-srvsvc: merge srvsvc_NetSetFileSecurity from s3 idl.
Guenther
2008-10-31 02:44:29 +01:00
Günther Deschner
0b95cb251c s4-srvsvc: merge srvsvc_NetShareInfo502 from s3.
Apparently both s3 and s4 are not entirely correct one this. metze is looking
into hand-marshalling security descriptors so this will fix this finally. For
now, just keep the two in sync.

Guenther
2008-10-31 02:44:29 +01:00
Günther Deschner
4b8606f616 s4-srvsvc-idl: pure cosmetic merge from s3 idl.
Guenther
2008-10-31 02:44:28 +01:00
Günther Deschner
d0b02f9708 s4-srvsvc-idl: use maxuses as uint32 consistently.
Guenther
2008-10-31 02:44:28 +01:00
Günther Deschner
ecd2434d69 s4-srvsvc-idl: adapt some more formating changes from s3 idl.
Guenther
2008-10-29 13:31:02 +01:00
Günther Deschner
8be9cefd98 netlogon: merge netlogon.idl between s3 and s4.
Guenther
2008-10-29 08:57:53 +01:00
Günther Deschner
524156333b s4-netlogon: merge netr_ServerPasswordSet2 from s3 idl.
Guenther
2008-10-29 08:57:52 +01:00
Günther Deschner
556b5bb9ee s4-netlogon: merge netr_ServerPasswordSet from s3 idl.
Guenther
2008-10-29 08:57:52 +01:00
Günther Deschner
1798e9d7ec s4-netlogon: merge netr_ServerReqChallenge from s3 idl.
Guenther
2008-10-29 08:57:52 +01:00
Günther Deschner
8e4c691c0a s4-netlogon: merge netr_ServerAuthenticate{2,3} from s3 idl.
Guenther
2008-10-29 08:57:51 +01:00
Günther Deschner
8f52c33401 s4-netlogon: merge netr_DatabaseRedo from s3 idl.
Guenther
2008-10-29 08:57:51 +01:00
Günther Deschner
ef37351f18 s4-netlogon: merge netr_DatabaseSync2 from s3 idl.
Guenther
2008-10-29 08:57:51 +01:00
Günther Deschner
cbc0b63a77 s4-netlogon: merge netr_DatabaseSync from s3 idl.
Guenther
2008-10-29 08:57:51 +01:00
Günther Deschner
f285af6367 s4-netlogon: merge netr_LogonSamLogon{Ex,WithFlags} from s3 idl.
Guenther
2008-10-29 08:57:31 +01:00
Günther Deschner
0de8811a59 s4-netlogon: merge netr_AccountSync from s3 idl.
Guenther
2008-10-29 08:57:28 +01:00
Günther Deschner
fccd5a4dfd s4-netlogon: merge netr_AccountDeltas from s3 idl.
Guenther
2008-10-29 08:57:28 +01:00
Günther Deschner
6f2179b088 s4-netlogon: merge netr_DatabaseDeltas from s3 idl.
Guenther
2008-10-29 08:57:28 +01:00
Günther Deschner
4f6264b66c s4-netlogon: merge netr_LogonGetDomainInfo from s3 idl.
Guenther
2008-10-29 08:57:27 +01:00
Günther Deschner
359927dd34 s4-netlogon: merge netr_LogonControl2Ex from s3 idl.
Guenther
2008-10-29 08:57:27 +01:00
Günther Deschner
8a79378469 s4-netlogon: merge netr_LogonControl2 from s3 idl.
Guenther
2008-10-29 08:57:27 +01:00
Günther Deschner
388952f82c s4-netlogon: merge netr_LogonControl from s3 idl.
Guenther
2008-10-29 08:57:26 +01:00
Günther Deschner
f0697b0ad5 s4-netlogon: merge netr_DsRGetDCName{Ex,Ex2} from s3 idl.
Guenther
2008-10-29 08:56:52 +01:00
Günther Deschner
f82a117832 s4-netlogon: merge netr_GetDcName from s3 idl.
Guenther
2008-10-28 23:40:53 +01:00
Günther Deschner
a674a3bbf3 s4-netlogon: merge netr_GetAnyDCName from s3 idl (untested).
Guenther
2008-10-28 23:40:53 +01:00
Günther Deschner
2a329c4963 s4-netlogon: merge netr_DsRGetSiteName from s3 idl.
Guenther
2008-10-28 23:40:52 +01:00
Günther Deschner
2a7de4e3f8 s4-netlogon: merge netr_DsrEnumerateDomainTrusts from s3 idl.
Guenther
2008-10-28 23:40:52 +01:00
Günther Deschner
0992a9d987 s4-netlogon: merge netr_DsrGetDcSiteCoverageW from s3 idl.
Guenther
2008-10-28 23:40:51 +01:00
Günther Deschner
bb3836a67f s4-smbtorture: fix test_LogonUasLogon.
Guenther
2008-10-28 23:40:44 +01:00
Günther Deschner
98f8f89164 s4-netlogon: merge misc stuff.
Guenther
2008-10-28 23:37:40 +01:00
Günther Deschner
d04131c8ec idl: share lsa.idl between s3 and s4.
Guenther
2008-10-27 19:33:23 +01:00
Günther Deschner
95231eae39 s4-lsa: merge lsa_QueryInfoPolicy/{2} from s3 lsa idl.
Guenther
2008-10-27 19:33:23 +01:00
Günther Deschner
92f1c0d156 s4-lsa: merge lsa_LookupNames/{2,3,4} from s3 lsa idl.
Guenther
2008-10-27 19:33:23 +01:00
Günther Deschner
992c03a192 s4-lsa: merge lsa_LookupSids/{2,3} from s3 lsa idl.
Guenther
2008-10-27 19:33:23 +01:00
Günther Deschner
8e622f57e7 s4-lsa: merge lsa_QueryDomainInformationPolicy from s3 lsa idl.
Guenther
2008-10-27 19:33:23 +01:00
Günther Deschner
ea88686419 s4-lsa: merge lsa_QueryTrustedDomainInfoByName from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
36725ec0b4 s4-lsa: merge lsa_QueryTrustedDomainInfo from s3 idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
7c3d1dd8a9 s4-lsa: merge lsa_QueryTrustedDomainInfoBySid from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
8bcc939a8c s4-lsa: merge lsa_LookupPrivName from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
ea6b4865ea s4-lsa: merge lsa_EnumPrivsAccount from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
95c69caef6 s4-lsa: merge lsa_LookupPrivDisplayName from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
6a2dabe1a7 s4-lsa: merge lsa_GetUserName from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
6131c0d888 s4-lsa: merge lsa_EnumTrustDom from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
7e19dd6a0a s4-lsa: merge lsa_EnumAccounts from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
fb38705e42 s4-lsa: merge lsa_EnumPrivs from s3 lsa idl.
Guenther
2008-10-27 19:33:22 +01:00
Günther Deschner
4ee7b58e0a s4-lsa: merge lsa_QuerySecurity from s3 lsa idl.
Guenther
2008-10-27 19:33:21 +01:00
Jelmer Vernooij
e72e2773c4 Remove another use of global_loadparm. 2008-10-24 18:15:09 +02:00
Jelmer Vernooij
23302413b3 Remove unused include param/param.h. 2008-10-24 16:37:56 +02:00
Jelmer Vernooij
37d885c51a Remove iconv_convenience argument from convert_string{,talloc}() but
make them wrappers around convert_string{,talloc}_convenience().
2008-10-24 14:26:46 +02:00
Jelmer Vernooij
8b06312f7e Eliminate another instance of global_loadparm. 2008-10-24 13:13:27 +02:00
Günther Deschner
bb36f3a342 idl: merge from s4 lsa.idl to s3.
Guenther
2008-10-20 22:09:07 +02:00
Jelmer Vernooij
6d2d09348f Sync syntax of srvsvc.idl with samba3. 2008-10-20 19:50:49 +02:00
Jelmer Vernooij
41b02b7ac0 Move orpc to top-level directory. 2008-10-20 19:20:12 +02:00
Jelmer Vernooij
dc3828f06c Move WMI support code to top-level. 2008-10-20 19:14:47 +02:00
Jelmer Vernooij
87ec1d2532 Make sure prototypes are always included, make some functions static and
remove some unused functions.
2008-10-20 18:59:51 +02:00
Jelmer Vernooij
66b1c8b61a Import comments about opcodes from Samba 3. 2008-10-20 17:16:04 +02:00
Jelmer Vernooij
e0905c3090 Use tables in Samba 3 ndrdump. 2008-10-20 13:19:39 +02:00
Jelmer Vernooij
db90d9ad16 Also move wireshark conformance file. 2008-10-20 12:20:53 +02:00
Jelmer Vernooij
d78f3be238 Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt 2008-10-20 12:19:57 +02:00
Jelmer Vernooij
5b52964b15 Share winreg.idl. 2008-10-20 11:53:20 +02:00
Günther Deschner
fc8fadf1e9 idl: finally share krb5_pac.idl.
Guenther
2008-10-20 11:11:22 +02:00
Matthias Dieter Wallnöfer
b789ff950f LSA Patch for User Manager
New (major) patch
=================
- Enhances the "lsa.idl" file in the sense that it adds more values to
"PolicyInformation" to improve the "lsa_QueryInfoPolicy*" calls.
- Adds a minimal implementation for "AuditEvents" (also lsa_QueryInfoPolicy*
calls) to enable the "Audit" option in the "User Manager for Domains" (at least
readable).
- Adds to the "lsa.idl" file the system access mode flags needed for the calls
"lsa_*SystemAccessAccount".
- Fill in the "lsa_GetSystemAccessAccount" for enabling the "User Rights"
option in the "User Manager for Domains" (at least readable).
- Merge the two similar torture tests of the "lsa_QueryInfoPolicy*" calls in
one using "if"'s for a few separations.
- Add a torture test for "lsa_GetSystemAccessAccount".
- Some cosmetic-only changes (unifications) in output strings in the "LSA"
torture test.

The work has been done using the Microsoft WSPP docs.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2008-10-20 20:07:09 +11:00
Günther Deschner
f34b6bfe34 idl: share drsblobs idl.
Guenther
2008-10-18 23:54:49 +02:00
Günther Deschner
80af41b5ea drsuapi: build new merged drsuapi idl and helpers.
Guenther
2008-10-18 23:25:58 +02:00
Günther Deschner
d413e1f40a drsuapi: share drsuapi idl and helper code.
Guenther
2008-10-18 23:25:48 +02:00
Günther Deschner
dd49f7483b s4-drsuapi: merge drsuapi_DsGetNCChanges from s3 drsuapi idl.
Guenther
2008-10-18 23:06:39 +02:00
Günther Deschner
6ddaf5f160 s4-drsuapi: merge drsuapi_DsCrackNames from s3 drsuapi idl.
Guenther
2008-10-18 23:06:31 +02:00
Günther Deschner
ca84c406d3 s4-drsuapi: merge drsuapi_DsGetDomainControllerInfo from s3 drsuapi idl.
Guenther
2008-10-18 23:06:24 +02:00
Günther Deschner
32a1d55797 s4-drsuapi: merge drsuapi_DsWriteAccountSpn from s3 drsuapi idl.
Guenther
2008-10-18 23:06:17 +02:00
Günther Deschner
b684efacf5 s4-drsuapi: merge drsuapi_DsRemoveDSServer from s3 drsuapi idl.
Guenther
2008-10-18 23:06:07 +02:00
Günther Deschner
bc1d39483c s4-drsuapi: merge drsuapi_DsAddEntry from s3 drsuapi idl.
Guenther
2008-10-18 23:05:59 +02:00
Jelmer Vernooij
6a89b59ca6 Add TALLOC_CTX pointer to strhex_to_data_blob for consistency with Samba
3.
2008-10-18 18:09:04 +02:00
Günther Deschner
e941e4ad52 s4: merge from s3 drsuapi.idl.
Guenther
2008-10-17 10:54:01 +02:00
Andrew Bartlett
c35b0d9ab5 Merge branch 'master' of ssh://git.samba.org/data/git/samba into master-devel 2008-10-17 15:57:07 +11:00
Günther Deschner
80f9029aae s4-idl: merge drsuapi.idl from s3.
Guenther
2008-10-16 11:33:33 +02:00
Andrew Bartlett
7c88ea8aad Create a 'straight paper path' for UTF16 passwords.
This uses a virtual attribute 'clearTextPassword' (name chosen to
match references in MS-SAMR) that contains the length-limited blob
containing an allegidly UTF16 password.  This ensures we do no
validation or filtering of the password before we get a chance to MD4
it.  We can then do the required munging into UTF8, and in future
implement the rules Microsoft has provided us with for invalid inputs.

All layers in the process now deal with the strings as length-limited
inputs, incluing the krb5 string2key calls.

This commit also includes a small change to samdb_result_passwords()
to ensure that LM passwords are not returned to the application logic
if LM authentication is disabled.

The objectClass module has been modified to allow the
clearTextPassword attribute to pass down the stack.

Andrew Bartlett
2008-10-16 12:48:16 +11:00
Günther Deschner
d242491488 idl: finally fully share nbt.idl in s3 and s4.
Guenther
2008-10-15 21:44:39 +02:00
Günther Deschner
a1b7b6d5b4 idl: more lsa.idl merges.
Guenther
2008-10-15 20:46:35 +02:00
Günther Deschner
e561c9acd5 s4: merge from s3 lsa idl.
Guenther
2008-10-15 19:45:28 +02:00
Jelmer Vernooij
4c61745573 Merge branch 'master' of git://git.samba.org/samba 2008-10-15 17:48:25 +02:00
Günther Deschner
11ecd5acfd s4: merge from s3 samr.idl.
Guenther
2008-10-15 17:42:33 +02:00
Jelmer Vernooij
ada0e343b2 Sync parameter names with samba 3. 2008-10-15 17:38:51 +02:00
Jelmer Vernooij
fed4658c1b winreg.idl: Sync ref change from Samba 3. 2008-10-15 17:34:55 +02:00
Jelmer Vernooij
5390dc0d24 Share wkssvc.idl. 2008-10-15 16:48:53 +02:00
Jelmer Vernooij
85c36cb2cd Share eventlog.idl. 2008-10-15 16:37:27 +02:00
Jelmer Vernooij
5d408ccf83 Rename reboot -> do_reboot since the first is a reserved name on FreeBSD. 2008-10-15 16:25:06 +02:00
Jelmer Vernooij
ec63a6f5ad Merge branch 'master' of git://git.samba.org/samba 2008-10-15 16:16:01 +02:00
Günther Deschner
9b162bd3a9 idl: merge netlogon IDL between s3 and s4 wrt LogonSamLogon.
Guenther
2008-10-15 16:14:19 +02:00
Jelmer Vernooij
881b36f4cf Share initshutdown.idl. 2008-10-15 16:13:02 +02:00
Jelmer Vernooij
0c840bd8d2 Share xattr implementation. 2008-10-15 15:57:39 +02:00
Jelmer Vernooij
760dfa76d9 Share epmapper. 2008-10-15 15:31:49 +02:00
Günther Deschner
94d7e52dd8 idl: more netlogon merges between s3 and s4.
Guenther
2008-10-15 15:14:00 +02:00
Günther Deschner
714cde8bc1 s4-idl: merge netlogon bits from s3.
Guenther
2008-10-15 14:16:31 +02:00
Günther Deschner
5c8944a5b9 s4-idl: merge lsa_BinaryString from s3.
Guenther
2008-10-15 14:15:57 +02:00
Günther Deschner
f0fd834141 share ntsvcs.idl.
Guenther
2008-10-15 12:03:12 +02:00
Günther Deschner
fe46368e09 move svcctl to main idl directory.
Guenther
2008-10-15 11:37:42 +02:00
Jelmer Vernooij
aaa3e0425d Fix includes. 2008-10-15 02:52:10 +02:00
Jelmer Vernooij
4695504a6c Share security.idl. 2008-10-15 02:33:16 +02:00
Jelmer Vernooij
f75b460814 Share misc.idl. 2008-10-15 02:08:24 +02:00
Jelmer Vernooij
4f6a4b5510 Share idl_types.h. 2008-10-15 01:53:09 +02:00
Jelmer Vernooij
45f97c4614 Move shared DCE/RPC IDL files to root IDL dir. 2008-10-15 01:23:36 +02:00
Jelmer Vernooij
7f24027e02 Allow specifying the exact IDL files to build. 2008-10-15 01:15:58 +02:00
Jelmer Vernooij
95a86edd97 Fix installation of libndr.h 2008-10-15 01:11:18 +02:00
Jelmer Vernooij
0132423a09 Share libndr.h between Samba 3 and Samba 4. 2008-10-15 00:35:13 +02:00
Jelmer Vernooij
5198fb6e19 Share ndr_krb5pac implementation. 2008-10-14 23:52:20 +02:00
Jelmer Vernooij
f02a68a89f Share ndr_compression.c. 2008-10-14 23:46:34 +02:00
Jelmer Vernooij
d940012dc8 Move ndr pkg-config file to top-level. 2008-10-14 16:23:46 +02:00
Jelmer Vernooij
a9d8ed748e Sync with Samba 3. 2008-10-14 15:43:04 +02:00
Jelmer Vernooij
2049cfe743 Share ndr.c implementation. 2008-10-13 16:09:48 +02:00
Jelmer Vernooij
2fddd2e2d5 Share ndrdump implementation. 2008-10-13 15:58:45 +02:00
Jelmer Vernooij
6d02f0805a Import warning fixes from Samba 3 into libndr, sync more libndr code. 2008-10-13 15:33:40 +02:00
Jelmer Vernooij
58f844ab54 Share uuid implementations. 2008-10-13 15:23:35 +02:00
Jelmer Vernooij
8cae7a5bab Share ndr_misc implementations. 2008-10-13 15:22:27 +02:00
Jelmer Vernooij
390d37187a Share ndr_basic implementation. 2008-10-13 15:20:10 +02:00
Jelmer Vernooij
5ae73c67b5 Import warning fixes from Samba 3. 2008-10-13 15:17:41 +02:00
Jelmer Vernooij
bf768aa1ec Import debug macros from Samba 3's libndr. 2008-10-13 14:30:41 +02:00
Jelmer Vernooij
3994c42f19 Fix number of arguments for file_load() functions. 2008-10-12 19:46:38 +02:00
Jelmer Vernooij
9f2ed1e00f Share RPC binding string utility functions. 2008-10-12 19:05:46 +02:00
Jelmer Vernooij
9565999755 Fix include paths to new location of libutil. 2008-10-11 21:31:42 +02:00
Jelmer Vernooij
caa4e42860 Move lib/util from source4 to top-level libutil.
Conflicts:

	source4/Makefile
2008-10-11 21:05:38 +02:00
Andrew Bartlett
8e1c0470d7 Add in secure channel type used by AD trusts 2008-10-06 14:28:25 -07:00
Andrew Bartlett
8cdb3ebe27 Clarify use of manual parsers in trustInOutBlob (drsblobs.idl) 2008-10-06 14:28:25 -07:00
Andrew Bartlett
8256717c76 Implement 'type unknown' names in the CrackNames code.
This guesses the type by running each of the possible options.

Andrew Bartlett
2008-10-06 14:28:24 -07:00
Andrew Tridgell
ba5ef49f83 updated the LSA and NETLOGON servers with fixes resulting from the AD
plugfest in Redmond
2008-10-03 17:52:59 -07:00
Andrew Tridgell
23ec448f83 Merge commit 'master/master' 2008-10-03 12:23:00 -07:00
Stefan Metzmacher
3c9f3c32d1 s4:drsuapi.idl: fix some fields in drsuapi_DsRemoveDSServer()
metze
2008-10-02 12:20:59 +02:00
Andrew Tridgell
69fe3a5ddd fixed a number of places in our LSA server where we should return the
sid/name array even when all are unmapped. If we don't fill in the
array then the windows client runtime crashes
2008-09-30 13:42:30 -07:00
Andrew Tridgell
f84093df86 Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-09-30 13:02:09 -07:00
Jelmer Vernooij
ae38514534 Merge branch 'master' of ssh://git.samba.org/data/git/samba 2008-09-30 14:57:51 +02:00