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

75564 Commits

Author SHA1 Message Date
Amitay Isaacs
eebb37c9b2 py-samba3-test: Set lock directory to the datadir
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:07:28 +10:00
Amitay Isaacs
7017e6b882 testdata: Set netbios name in the samba3 configuation
To correctly find the domain sid, passdb api uses netbios name to
look up secrets database. If no nebios name is configured, passdb uses
current hostname and adds entry for hostname in secrets and uses that
instead of the intended one.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:33 +10:00
Amitay Isaacs
d8465f2a91 s3_upgrade: Update commandline options and use updated samba3 python module
upgrade_from_s3 script now requires samba3 configuration file and target
directory for samba4 database. In addition, it either uses --libdir option
or --testparm option to correctly guess the paths for samba3 databases
(private dir and state directory).

Usage: upgrade_from_s3 [options] <configuration_file> <targetdir>

Input arguments are:
  <configuration_file> - path to existing smb.conf
  <targetdir>          - directory in which samba4 database will be created

In addition, specify either samba3 database directory (with --libdir) or
samba3 testparm utility (with --testparm).

Before using passdb interface, initialize s3 loadparm context using
correct path settings for private dir and state directory.

Export account policy from s3 to s4.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:33 +10:00
Amitay Isaacs
d2536b3120 py-samba3: Use passdb/param wrapper for samba3 module
Instead of parsing samba3 database files (password, group mapping,
account policy, secrets), use passdb python wrapper.

Similarly for parsing configuration, use samba3 param python wrapper.

Other databases (idmap, registry, wins) are still parsed in python.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:33 +10:00
Amitay Isaacs
17c74e5dfd s3-passdb: Make domain_sid argument optional for search_aliases method
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:33 +10:00
Amitay Isaacs
0cfeb65a0b s3-passdb: Return assigned number of hours and not MAX_HOURS_LEN
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:33 +10:00
Amitay Isaacs
a38a3b16e1 s3-passdb: Convert lm_pw and nt_pw to python string using length
lm_pw and nt_pw are fixed length strings and convert them to python
strings as fixed length strings.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:32 +10:00
Amitay Isaacs
b2068162f7 script: Fix the name of the script in autogenerated header file
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:32 +10:00
Amitay Isaacs
b5da5f7379 s4-param: Use s3 dump method if s3 context is defined
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:32 +10:00
Amitay Isaacs
d847f62161 s3-param: Add a dump() method to output parameters
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:32 +10:00
Amitay Isaacs
7f67d7b5ca s3_upgrade: Let python generate backtrace for unknown exceptions
Catch known exceptions only.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:32 +10:00
Amitay Isaacs
886203f3bc s3_upgrade: Add document strings for python methods
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
2011-08-26 10:06:32 +10:00
Michael Adam
a3538b92d3 werror: remove duplicate definition of WERR_INVALID_OWNER
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Aug 26 01:23:52 CEST 2011 on sn-devel-104
2011-08-26 01:23:52 +02:00
Michael Adam
9d3fa10c35 s3:dbwrap_tdb: correctly catch the error from the return code of tdb_parse in db_tdb_fetch() 2011-08-25 23:55:06 +02:00
Michael Adam
316834cf42 s3:smbd: remove an unused variable in dptr_create() 2011-08-25 23:55:06 +02:00
Michael Adam
1e09f12d1f s3:registry: fix the v2_to_v3 upgrade code so that it does not create value list security records for the INFO/version key ... 2011-08-25 23:55:06 +02:00
Michael Adam
9b46798b11 s3:registry: fix the v1_to_v2 upgrade code so that it does not normalize the INFO/version key ... 2011-08-25 23:55:06 +02:00
Michael Adam
b4cb969e40 s3:registry: define a constant REGDB_VERSION_KEYNAME for the key INFO/version (and use it) 2011-08-25 23:55:06 +02:00
Michael Adam
b1a94b66cc s3:registry: hand db context in to v2_to_v3 upgrade code via private_data
This also fixes the earlier faulty handing in of a useless stackframe
memory context via private_data.
2011-08-25 23:55:06 +02:00
Michael Adam
48f08011e5 s3:registry: fix broken use of dbwrap store record in v1_to_v2 upgrade code
This also fixes broken private_data parameter for the traverse function
(making use of it): Originally a memory context was handed in but was not used.
2011-08-25 23:55:06 +02:00
SATOH Fumiyasu
faa769ec19 s3: Fix the build of vfs_aixacl2.c
Autobuild-User: Volker Lendecke <vlendec@samba.org>
Autobuild-Date: Thu Aug 25 23:06:12 CEST 2011 on sn-devel-104
2011-08-25 23:06:11 +02:00
Volker Lendecke
77810431c9 s3: Remove a bogus comment 2011-08-25 21:36:19 +02:00
Volker Lendecke
f533b50105 s3: Pass smbd_server_connection to (unused) server_encryption_shutdown 2011-08-25 21:36:19 +02:00
Volker Lendecke
7e70f85350 s3: Pass smbd_server_connection to srv_encrypt_buffer 2011-08-25 21:36:19 +02:00
Volker Lendecke
d4c4705e55 s3: Pass smbd_server_connection to srv_decrypt_buffer 2011-08-25 21:36:19 +02:00
Volker Lendecke
08262fe964 s3: Pass smbd_server_connection to srv_free_enc_buffer 2011-08-25 21:36:19 +02:00
Volker Lendecke
f9ef138ec7 s3: Pass smbd_server_connection to is_encrypted_packet 2011-08-25 21:36:19 +02:00
Volker Lendecke
b4b9918cc8 s3: Pass sconn to valid_smb_header 2011-08-25 21:36:19 +02:00
Volker Lendecke
4cb6e1284c s3: Explicitly pass smb_srv_trans_enc_ctx to srv_enc_ctx 2011-08-25 21:36:18 +02:00
Volker Lendecke
16888be44a s3: Fix some nonempty blank lines 2011-08-25 21:36:18 +02:00
Volker Lendecke
50e30afa60 s3: Fix bug 8385
Poll and select behave differently regarding error handling. When doing the
connect(2), we can not rely on poll telling us both readability and writability
upon error. Just always try a second connect(2). At least on Linux it returns 0
when it succeeded.

Signed-off-by: Jeremy Allison <jra@samba.org>

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Thu Aug 25 19:39:12 CEST 2011 on sn-devel-104
2011-08-25 19:39:12 +02:00
Günther Deschner
1593654914 s3-waf: fix some unresolved symbols in idmap ad modules.
Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Aug 25 15:15:57 CEST 2011 on sn-devel-104
2011-08-25 15:15:56 +02:00
Günther Deschner
e00a6c40bf s3-registry: fix bug #8401 - registry/reg_format.c must include includes.h.
Guenther
2011-08-25 13:45:34 +02:00
Andrew Tridgell
68a42bd762 s4-dsdb: fixed use of RMD flags in ldb search in dirsync module
I'm pretty sure a SHOW_DELETED was wanted here

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Aug 25 01:10:13 CEST 2011 on sn-devel-104
2011-08-25 01:10:13 +02:00
Andrew Tridgell
b2c6b0122f s4-dns: fixed dns_update_list for multi-domain forests
this should now match the DNS entries of w2k8r2c 

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-08-25 07:39:39 +10:00
Andrew Tridgell
08b2aa0843 s4-dns: cope with duplicate entries in dns_update_list
this is needed for when DNSFOREST and DNSDOMAIN are the same

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-08-25 07:39:39 +10:00
Andrew Tridgell
345220b762 s4-dsdb: fixed newlines in DEBUG() calls in cracknames
Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-08-25 07:39:39 +10:00
Andrew Tridgell
32c5e3b204 s4-join: fixed DNS hostname
we need the local hostname, not the remote name
2011-08-25 07:39:39 +10:00
Andrew Tridgell
dea4f3941b s4-drs: fixed msdcs DNS name in getncchanges 2011-08-25 07:39:39 +10:00
Andrew Tridgell
085936926a s4-libnet: fixed forest DNS name
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-25 07:39:39 +10:00
Andrew Tridgell
4f421d0406 s4-acl: use dnsforest not dnsdomain for GC names 2011-08-25 07:39:39 +10:00
Andrew Tridgell
68100e5a21 s4-join: setup DNS forest name on join context 2011-08-25 07:39:39 +10:00
Andrew Tridgell
717706cb96 s4-dns/spn: fixed DNS and SPN scripts to setup forest DNS name 2011-08-25 07:39:38 +10:00
Andrew Tridgell
219271bd15 s4-samdb: added host_dns_name(), domain_dns_name() and forest_dns_name()
these will make it easier to get python code right for multi-domain
support
2011-08-25 07:39:38 +10:00
Andrew Tridgell
5a9dc1d216 s4-repl: fixed _msdcs DNS name
another multi-domain fix
2011-08-25 07:39:38 +10:00
Andrew Tridgell
484fb303ff s4-kcc: fixed _msdcs DNS name
we need to base this DNS name on the forest DNS name for multi-domain
support

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-08-25 07:39:38 +10:00
Andrew Tridgell
9784fbc378 s4-dsdb: added samdb_ntds_msdcs_dns_name()
this gets the DNS name for a NTDS GUID, based on the forest DNS name

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-08-25 07:39:38 +10:00
Andrew Tridgell
42ae193e3f s4-dns: fixed DNS and SPN update lists for multi-domain support
fixed DNS to point at forest root

Pair-Programmed-With: Amitay Isaacs <amitay@gmail.com>
2011-08-25 07:39:38 +10:00
Andrew Tridgell
53b08bfbdb s4-provision: pass the rootDN into guess_names()
this gets the correct forest DN during provision

Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
2011-08-25 07:39:38 +10:00
Andrew Tridgell
27656e9123 s4-dsdb: fixed calls to ldb_val_string_cmp()
wrong order of arguments
2011-08-25 07:39:38 +10:00