diff options
Diffstat (limited to 'source4/lib/samba3')
| -rw-r--r-- | source4/lib/samba3/PLAN | 46 | ||||
| -rw-r--r-- | source4/lib/samba3/tdbsam.c | 24 |
2 files changed, 3 insertions, 67 deletions
diff --git a/source4/lib/samba3/PLAN b/source4/lib/samba3/PLAN index 87add2096e..abc3d5d6ae 100644 --- a/source4/lib/samba3/PLAN +++ b/source4/lib/samba3/PLAN @@ -1,44 +1,4 @@ -Three possible viable approaches: - 1) TDB conversion approach. Read in TDB dump out LDIF (one-way) - - samr.ldb: from tdbsam/smbpasswd, account_policy.tdb, secrets.tdb, group_mapping.tdb - - registry.ldb: from registry.tdb - - wins.ldif: from wins.tdb/wins.dat - - smb.conf/ea's: generated from the old smb.conf + share_info.tdb - - winbind.ldif: from winbindd_idmap.tdb (custom file format, not used - by samba4 yet as it doesn't - have Winbind yet) - - (one-way upgrades can be done by using ldbsearch -a on these dynamically - generated ldb's) - Since TDB's are local, there isn't much point in writing back backwards - compatible data. - - 2) samr "mapping" backend (alternative for samr.ldb) (two-way) - This would allow users to keep mixed domains containing Samba3 and Samba4. - - 3) The vampire way of doing things (one-way) - - samba3 pidl backend - - Samba4 vampire + server side samsync support in Samba3 - - unixinfo (\unixinfo) - - in Samba4 (client side) - - in Samba3 (server side) - - winsrepl (thru seperate pipe?) - - enum/add shares (\srvsvc) - - enum/add registry (\winreg) - - enum/add printers (\winreg, perhaps also \spoolss(?)) - - convert smb.conf (using Jerry's registry hack) - -(going with a combination of 1 and 2) - -ldb mapping backend: - - -Upgrade process: - - take libdir & smb.conf - - read various tdb files / old smb.conf - - write new smb.conf (ejs) - - list of parameters to keep.. generate some of the others - - add generated LDIF (ejs). Call out to current provisioning - -TODO: +TODO (SoC project): - move ini parsing stuff to seperate file param/ini.c + - test ldb_map backend (testsuite?) + - parse "passdb backend" setting and parse tdbsam/passdb based on it diff --git a/source4/lib/samba3/tdbsam.c b/source4/lib/samba3/tdbsam.c index fc293d5df9..5397abca49 100644 --- a/source4/lib/samba3/tdbsam.c +++ b/source4/lib/samba3/tdbsam.c @@ -84,14 +84,6 @@ static BOOL init_sam_from_buffer_v0(TDB_CONTEXT *tdb, struct samba3_samaccount * return False; } - if (lm_pw_len != 16) { - return False; - } - - if (nt_pw_len != 16) { - return False; - } - return True; } @@ -150,14 +142,6 @@ static BOOL init_sam_from_buffer_v1(TDB_CONTEXT *tdb, struct samba3_samaccount * return False; } - if (lm_pw_len != 16) { - return False; - } - - if (nt_pw_len != 16) { - return False; - } - return True; } @@ -216,14 +200,6 @@ static BOOL init_sam_from_buffer_v2(TDB_CONTEXT *tdb, struct samba3_samaccount * return False; } - if (lm_pw_len != 16) { - return False; - } - - if (nt_pw_len != 16) { - return False; - } - return True; } |