1
0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00

581 Commits

Author SHA1 Message Date
Jelmer Vernooij
375da9787e Improve DEBUG output somewhat more
(This used to be commit 2cc36ce0ee8383aa8a20a8dc5a3218693dc46817)
2002-11-11 18:54:13 +00:00
Jelmer Vernooij
29edab7547 Add more debug info
(This used to be commit 065ed9783236cf1e8254655a9a1d4de937b35018)
2002-11-11 18:42:13 +00:00
Jelmer Vernooij
af6902f5bf Print the number of returned rows, not the number of fields
(This used to be commit cf74ddc2fcb1e7286441edb432d8906bb722a3d4)
2002-11-10 16:30:23 +00:00
Jelmer Vernooij
e1a9236092 Back out some of my sync changes
(This used to be commit b1ad91101d10d1fa635cfbb1684f8b598280cee0)
2002-11-09 23:28:40 +00:00
Jelmer Vernooij
dc5297f413 Sync with HEAD
(This used to be commit 1a25dc776ddc36de9a214e023becff1ceb10290c)
2002-11-09 16:57:45 +00:00
Andrew Bartlett
c19598f2a6 Merge from HEAD:
- change auth_sam to use the initialisation flags to determine if
	 the password attributes are set

 - add const to secrets.c, cliconnect.c

 - passdb:  fix spelling in pdb_ldap, add group mapping back to smbpasswd

 - SAMR: add debugs to show what fails for group enum.

Andrew Bartlett
(This used to be commit 4e74d00b3634abf52aa24bfaa6dbe88202aa57a1)
2002-11-08 23:08:59 +00:00
cvs2svn Import User
2446d245df This commit was manufactured by cvs2svn to create branch 'SAMBA_3_0'.(This used to be commit aafa32d6809e1bc60a8186140f2f3cf2bf6bff16) 2002-11-07 19:45:56 +00:00
Jelmer Vernooij
0cd37de198 Fix small typo
(This used to be commit 3c39bd9db09c59f149d77e371ed078cd7ec2d1b4)
2002-11-07 19:45:55 +00:00
Jeremy Allison
bf3eda8249 Jeremy the janitor again... keeping 3.0 in sync with tridge's changes this
time.
Jeremy.
(This used to be commit 3803324d3d49f81ef0a82c4a9fedae70d32cb409)
2002-11-07 07:19:10 +00:00
Andrew Tridgell
720ca2c477 when doing a 'net rpc vampire' a pdb_init_sam_pw() is used to create a
sam account object, then pdb_update_sam_account() can be used to
update an account. This code path could lead to the methods element of
the account being used when uninitialised (leading to a segv)

Easiest fix is to always make that that when creating a sam_account
object we initialise the methods to null, so that the passdb code
knows that it needs to be filled in.
(This used to be commit fb79fa5a31c2fa8ebdcddbc49b1d9c1aa3059691)
2002-11-07 04:52:04 +00:00
Jeremy Allison
47955b2f6c Merge of scalable printing code fix... Needs testing.
Also tidied up some of Richard's code (I don't think he uses the compiler
flags -g -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual like
I do :-) :-).
Jeremy.
(This used to be commit 10024ed06e9d91f24fdc78d59eef2f76bf395438)
2002-11-07 02:38:42 +00:00
Jelmer Vernooij
6ae9de8f39 Add group management support (patch from metze)
(This used to be commit 090a2015eb9aa4ec68d80e972ae192d19afd536e)
2002-11-06 22:10:16 +00:00
Jelmer Vernooij
809c4715da Adapt to latest pdb API changes - only thing left is group support
(This used to be commit 99a2e7fde1fd4e589035c273f40419ef322e097d)
2002-11-06 12:26:21 +00:00
Jelmer Vernooij
5f119d4597 pdb_get_unknown? -> pdb_get_unknown_?
(This used to be commit c13ed6c866fed43e5f83e083c377a1cd7d505061)
2002-11-06 11:21:47 +00:00
Jelmer Vernooij
82c714569d Move pdb_xml to source/
(This used to be commit b68106a79e4536fa82d75dd330d07dba51bfeaf4)
2002-11-05 17:08:32 +00:00
Jelmer Vernooij
42f569f06c Move pdb_mysql to source/passdb
(This used to be commit 1d742e14ad18070aee654071d159b8b7410d6f86)
2002-11-05 16:48:23 +00:00
Andrew Bartlett
b81b71a8d1 Merge vl's 'algorithmic rid base' patch, and my changes to pdb_smbpasswd's NUA
support from HEAD -> 3.0

Andrew Bartlett
(This used to be commit 89d8ebd520e2a441e6d5b6b8adb6c483b0131adc)
2002-11-05 07:20:27 +00:00
Andrew Bartlett
3ae2fcd776 Allow 'normal' accounts in the non-unix-account range for smbpasswd - I hope
this will fix some of the problems on the build farm @ Compaq (where they have
a *lot* of accounts...).
(This used to be commit 2c97b7e6480c2731739ccc52af97bc62a6228cfe)
2002-11-04 13:15:53 +00:00
Andrew Bartlett
1336b8153e Fix debug
(This used to be commit 5b5b8de70e46a15e9fb9b47c7af6cb0133f41217)
2002-11-04 12:47:07 +00:00
Andrew Bartlett
a7f2feae31 Extra little fix to vl's patch. Make sure the passdb and testparm messages
say exactly the same thing - in particular that we can algorithmic rid base ==
1000, and use the BASE_RID macro to avoid the use of magic numbers.

Andrew Bartlett
(This used to be commit b70f2a8047ac549841bc103932b38951e9814186)
2002-11-03 14:13:43 +00:00
Volker Lendecke
9422775efd Force algorithmic rid base to sane values and talk about it.
Volker
(This used to be commit ce5b2d991b42bbf6865ff75194f8ee4b46694841)
2002-11-03 12:54:12 +00:00
Andrew Bartlett
b3b24fb690 Merge of my 'ldap trust ids' patch from HEAD.
This hopefully provides a peformance boost by not hitting getpwnam() for every
entry in an enumeration, instead reteriving entries directly (if available).

idra has reviewed this patch.

Andrew Bartlett
(This used to be commit 8abe71c4d7a796001c5765f4dd88c2e6f5637802)
2002-11-02 12:13:44 +00:00
Andrew Bartlett
593e0b5d00 Clean up this a little - add comments describing a bit of what is going on
here.
(This used to be commit 88455313f6551a75eff4df2f0ba91430948c1c78)
2002-11-02 07:54:04 +00:00
Andrew Bartlett
b017064cec Add a 'ldap trust ids' option that lets pdb_ldap check for posixAccount
attributes rather than calling getpwnam() on the user.

This should help fix some of metze's performance issues - particularly on
enumerations.

There is a consequential change to the operation of 'non unix account's in LDAP
- they are no longer restricted to being 'within' the NUA range, but will
always be added to that range.

Finally, there is the doco for this and the previous LDAP SSL changes.
(This used to be commit 18abaeffda300074a507561d8372d5bfddc8fe50)
2002-11-02 07:09:17 +00:00
Andrew Bartlett
6d7195d1d7 Merge passdb from HEAD -> 3.0
The work here includes:
 - metze' set/changed patch, which avoids making changes to ldap on unmodified
attributes.

 - volker's group mapping in passdb patch

 - volker's samsync stuff
 - volkers SAMR changes.

 - mezte's connection caching patch

 - my recent changes (fix magic root check, ldap ssl)

Andrew Bartlett
(This used to be commit 2044d60bbe0043cdbb9aba931115672bde975d2f)
2002-11-02 03:47:48 +00:00
Andrew Bartlett
531cea2937 Return the result code, not false (0 == success) on error...
(This used to be commit f91c363bc05d1c82ad8a99a5c0d59b46cf820aac)
2002-11-02 03:37:26 +00:00
Andrew Bartlett
a66b852ddc Fixes for pdb_ldap:
- Default is now for start-tls, on the ldap (not ldaps) port
 - We check for 'I am currently root' in the right place now, and don't
   accidentily use a cached connection.
 - We don't loop on failure to be root, or some other errors.

 - A bit cleaner error reporting for add/modify.

 - Both the OpenLDAP and manual URI parsing tested.

Andrew Bartlett
(This used to be commit cfa1e459d727764feddcfdd8c9c0404282e2d0e8)
2002-11-02 03:14:27 +00:00
Andrew Bartlett
35ac9d287f Try to catch up on the code I've put into HEAD that should be in 3.0:
- vorlan's hosts allow with DNS names patch
 - use x_fileno() in debug.c, not the struct directly.
 - check for server timeout on password change (was reporting success)
 - better error/status loggin in both the pam_winbind client and winbindd_pam
server code.
 - (pdb_ldap) don't set the ldap version twice - we do it on every bind anyway.
(This used to be commit 9fa1863d8e7788eda83911ca2610754486b33069)
2002-10-26 02:20:59 +00:00
Andrew Bartlett
991f6ddac6 One more step towards to better PDC.
This patch, from "Stefan (metze) Metzmacher" <metze@metzemix.de> implements an
LDAP connection cache.  This removes the quite silly situation where every
single passdb operation involved a new LDAP connection.

The hope is that this will give us a decent performance boost in some usrmgr
related activities, and in the sid->name/sid->uid code.

The remaining things I think are 'todo' for pdb_ldap (in the near term) are:
 - intergrate volker's next_rid patch for NUA accounts,
 - add a 'trust ldap ids' option (remove Get_Pwnam() hit on enumerations).
 - put the group mapping actually into ldap
 - Schema fixes and do utf8 conversion
 - server failover (try a second server for the rebind on fail)
 - ensure we block between an 'add' and the ldap master replicating to our
   local slave (mezte found this issue, kills domain joins)

Andrew Bartlett
(This used to be commit 3418da16456511490beb0d1045fff24576b48273)
2002-10-26 01:47:38 +00:00
Jelmer Vernooij
bea0b200c8 Fix memory leak (patch by Steve Langasek)
(This used to be commit 06362586cb754bd6bc89b50b966737958286ca2e)
2002-10-25 02:37:11 +00:00
Jelmer Vernooij
48216962c4 Fix memory leak (patch by Steve Langasek)
(This used to be commit 299a9060e27d341658a7badbbb21401fbcc8f083)
2002-10-25 02:35:44 +00:00
Jelmer Vernooij
12b1a63ceb Only run free_private_data when specified (reported by Steve Langasek aka vorlon)
(This used to be commit ecd3acbfcf912a775718e320c7cb66f60436c546)
2002-10-25 00:38:10 +00:00
Jelmer Vernooij
5b90fdc6bb Only run free_private_data when it's specified (reported by Steve Langasek aka vorlon)
(This used to be commit 9efa98b4a65a38df922ce3b83f5fde631cb70844)
2002-10-25 00:36:28 +00:00
Volker Lendecke
2d19a6550b pdb_unix.c did not really expect group RIDs dictated by a PDC and looking
like user RIDs.

Volker
(This used to be commit 872c7d40454545108ec9e7eee12894af77b4adc3)
2002-10-21 20:31:59 +00:00
Volker Lendecke
5dbf435408 This moves the group mapping API into the passdb backend.
Currently this calls back to mapping.c, but we have the framework
to get the information into LDAP and the passdb.tdb (should we? I
think so..).

This has received moderate testing with net rpc vampire and
usrmgr. I found the add_groupmem segfault in add_aliasmem as
well, but that will be another checkin.

Volker
(This used to be commit f30095852fea19421ac8e25dfe9c5cd4b2206f84)
2002-10-21 19:28:56 +00:00
Jeremy Allison
e9cc37b0bb Start to merge the new ACL mapping code from Andreas Gruenbacher <agruen@suse.de>.
Jeremy.
(This used to be commit 597c4610090d711fd30c1ffacc97212cf399a264)
2002-10-18 19:46:32 +00:00
Jeremy Allison
e13dd2f302 Start to merge the new ACL mapping code from Andreas Gruenbacher <agruen@suse.de>.
Jeremy.
(This used to be commit f6103f866a5e698ab55fdab1444a14e3d8da16bb)
2002-10-18 19:46:28 +00:00
Volker Lendecke
8cb53d56f2 Revert changes
(This used to be commit 975fd17f8af0f03f43995deb3fdd9bd5995a1c92)
2002-10-17 08:12:20 +00:00
Volker Lendecke
41a427b6ba Revert changes
(This used to be commit 84b62f6d96a77ccbc1b4475ab0780a4e4c9d4875)
2002-10-17 07:08:43 +00:00
Volker Lendecke
9e19e9e9c1 No functional change. I'm trying to understand pdb_ldap.c and
found an unecessary parameter to ldapsam_search_one_user.

Volker
(This used to be commit a085670c7e3a0ca82df749592fd5c6a86def1d53)
2002-10-16 15:49:58 +00:00
Volker Lendecke
4f001512cd Create group mappings on the fly.
Volker
(This used to be commit e2fc1de34aaf875a7003f9d15d5f8ecf159130fb)
2002-10-16 09:41:42 +00:00
Andrew Bartlett
4ac9ccfde4 Nice *big* patch from metze.
The actual design change is relitivly small however:

It all goes back to jerry's 'BOOL store', added to many of the elements in a
SAM_ACCOUNT.  This ensured that smb.conf defaults did not get 'fixed' into
ldap.  This was a great win for admins, and this patch follows in the same way.

This patch extends the concept - we don't store values back into LDAP unless
they have been changed.  So if we read a value, but don't update it, or we
read a value, find it's not there and use a default, we will not update
ldap with that value.  This reduced clutter in our LDAP DB, and makes it
easier to change defaults later on.

Metze's particular problem was that when we 'write back' an unchanged value,
we would clear any muliple values in that feild.  Now he can still have his
mulitivalued 'uid' feild, without Samba changing it for *every* other
operation.

This also applies to many other attributes, and helps to eliminate a nasty
race condition.  (Time between get and set)

This patch is big, and needs more testing, but metze has tested usrmgr, and
I've fixed some pdbedit bugs, and tested domain joins, so it isn't compleatly
flawed ;-).

The same system will be introduced into the SAM code shortly, but this fixes
bugs that people were coming across in production uses of Samba 3.0/HEAD, hence
it's inclusion here.

Andrew Bartlett
(This used to be commit 7f237bde212eb188df84a5d8adb598a93fba8155)
2002-10-12 03:38:07 +00:00
Andrew Bartlett
4920d21922 We already set LDAPv3 at connect time, no need to set it again.
(This used to be commit c8e32d485bf205b6965579f94063effd86777f3f)
2002-10-12 00:59:21 +00:00
Jeremy Allison
9c94d1a2f7 Add a timeout to tdb_lock_bystring(). Ensure we never have more than
MAX_PRINT_JOBS in a queue.
Jeremy.
(This used to be commit bb58a08af459b4abae9d53ab98c15f40638ce52b)
2002-10-04 22:53:30 +00:00
Jeremy Allison
3665777a5b Add a timeout to tdb_lock_bystring(). Ensure we never have more than
MAX_PRINT_JOBS in a queue.
Jeremy.
(This used to be commit 9fe3c0b90d4bff2217e3cb5a34b4683ca314c06e)
2002-10-04 22:53:18 +00:00
Andrew Bartlett
ad8a22e570 Updates from Samba HEAD:
- Fix segfaults in the 'net ads' commands when no password is provided
 - Readd --with-ldapsam for 2.2 compatability.  This conditionally compiles the
   old options, but the actual code is available on all ldap systems.
 - Fix shadow passwords (as per work with vl)
 - Fix sending plaintext passwords to unicode servers (again vl)
 - Add a bit of const to secrets.c functions
 - Fix some spelling and grammer by vance.
 - Document the -r option in smbgroupedit.

There are more changes in HEAD, I'm only merging the changes I've been involved
with.

Andrew Bartlett
(This used to be commit 83973c389355a5cc9ca74af467dfd8b5dabd2c8f)
2002-10-01 13:10:57 +00:00
Andrew Bartlett
0a23b0b4d5 Add const.
(This used to be commit f7dd66e88dba947a167d9a14c96810854dfc5c9d)
2002-09-28 12:11:19 +00:00
Andrew Bartlett
d95e86b8b9 Minor updates:
Add const to some more functions, and reintroduce 'net rpc join oldstyle' as
*only* trying an old-style join.

This means that we can rely on it not prompting for a password on the build
farm.

Andrew Bartlett
(This used to be commit 31bdbeef0ea6f30247cd3b30cfea57b34102abe6)
2002-09-27 04:33:58 +00:00
Andrew Bartlett
9e7a6d6b8b Readd the 2.2 --with-ldapsam paramaters so as to allow a smooth upgrade path to
a 3.0 based PDC.

Change defaults to use SSL, so that this also matches.

Andrew Bartlett
(This used to be commit 36c2a3820faa1d90cd331881720be0e61ab93460)
2002-09-27 01:02:37 +00:00
Gerald Carter
7d1eb6f7b6 sync with HEAD
(This used to be commit ee9cbf58071adb627a49a94c6340aaba330486b5)
2002-09-26 18:58:34 +00:00