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

74 Commits

Author SHA1 Message Date
Christof Schmitt
b75515248a s3-net: Allow setting the ldap password for idmap_rfc2307
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
2013-03-09 06:30:22 +01:00
Michael Adam
deea99ac36 s3:net: reduce indentation in net idmap delete for symmetry and consistency
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Christian Ambach <ambi@samba.org>
2013-02-05 17:36:35 +01:00
Michael Adam
50e3592ace s3:net: introduce a talloc stackframe for net idmap delete
this simplifies the freeing at the end

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Christian Ambach <ambi@samba.org>
2013-02-05 17:36:35 +01:00
Christian Ambach
8473764234 s3:net_idmap_delete do not lock two records at the same time
the lock order check will prohibit this and as we are running inside
a transaction there is no need to lock the records before deleting them

Pair-Programmed-With: Michael Adam <obnox@samba.org>

Signed-off-by: Christian Ambach <ambi@samba.org>
Signed-off-by: Michael Adam <obnox@samba.org>
2013-02-05 17:36:34 +01:00
Michael Adam
9aa79c11f0 s3:net idmap: use lp_idmap_default_backend() now that we have it.
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Christian Ambach <ambi@samba.org>
2013-02-05 17:36:34 +01:00
Michael Adam
cef05fbe8d s3:net idmap: remove call to lp_idmap_backend() - this is useless.
The variable behind lp_idmap_backend() is never set.

Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Christian Ambach <ambi@samba.org>
2013-02-05 17:36:33 +01:00
Christian Ambach
bab61a2159 s3:utils/net remove aclmapset command
this was made for the nfs4:sidmap code that has been removed, so
this subcommand can also go away

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

Autobuild-User(master): Michael Adam <obnox@samba.org>
Autobuild-Date(master): Tue Jan 29 15:37:18 CET 2013 on sn-devel-104
2013-01-29 15:37:18 +01:00
Christian Ambach
3a4ed4803f s3:net_idmap_dump support dumping autorid backend
- remember the type of idmapping database (tdb or autorid)
  this allows to make rest of the code (e.g. dump) know which database-style it will encounter
- add a seperate dump function for autorid
- default to TDB if db-file is given on the command-line

Pair-Programmed-With: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>

Signed-off-by: Christian Ambach <ambi@samba.org>
Signed-off-by: Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
Reviewed-by: Michael Adam <obnox@samba.org>
2013-01-29 13:46:35 +01:00
Christian Ambach
580008f307 s3:net_idmap_dump add missing braces
see README.Coding

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2013-01-29 12:56:47 +01:00
Christian Ambach
e0bd87ecc4 s3:net_idmap_dump remove obsolete support for tdb:idmap2.tdb parameter
this one got removed from idmap_tdb2 a while ago

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2013-01-29 12:56:31 +01:00
Christian Ambach
65268f482d s3:net_idmap_dump deal with idmap config * : backend config style
this is the new config style since Samba 3.6 and should be detected by net idmap dump

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
2013-01-29 12:56:11 +01:00
Jeremy Allison
526e875cec Check error returns from strupper_m() (in all reasonable places). 2012-08-09 12:06:54 -07:00
Rusty Russell
fe72740e82 loadparm: make the source3/ lp_ functions take an explicit TALLOC_CTX *.
They use talloc_tos() internally: hoist that up to the callers, some
of whom don't want to us talloc_tos().

A simple patch, but hits a lot of files.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
2012-07-18 15:07:23 +09:30
Volker Lendecke
749314fcf9 dbwrap: dbwrap_store_int32->dbwrap_store_int32_bystring
Signed-off-by: Michael Adam <obnox@samba.org>
2012-06-15 12:14:27 +02:00
Volker Lendecke
45e61fcf61 s3: Add a "lock_order" argument to db_open
This will be used to enforce a lock hierarchy between the databases. We have
seen deadlocks between locking.tdb, brlock.tdb, serverid.tdb and notify*.tdb.
These should be fixed by refusing a dbwrap_fetch_locked that does not follow a
defined lock hierarchy.
2012-01-18 14:48:04 +01:00
Michael Adam
c9bc1e4924 s3:dbwrap: change dbwrap_store_int32() to NTSTATUS return type
for consistency and better error propagation
2011-10-11 14:17:58 +02:00
Michael Adam
1f57f9ed13 s3:net: convert net idmap to use only dbwrap wrapper functions
Avoid direct use of the db_record and db_context structs.
2011-10-11 14:17:57 +02:00
Michael Adam
0b5c4a601a s3:dbwrap: move all .c and .h files of dbwrap to lib/dbwrap/
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Fri Jul 29 13:34:22 CEST 2011 on sn-devel-104
2011-07-29 13:34:22 +02:00
Michael Adam
1abdd9b2bb s3:dbwrap: move db_open() to a file dbwrap_open.c of its own.
Also start new folder lib/dbwrap/ where dbwrap_open.c is stored and
make the fallbacke implementation functoins non-static and create a
dbwrap_private.h header file that contains their prototypes.
2011-07-29 12:23:13 +02:00
Günther Deschner
d8cfca3a9b s3: only include tdb headers where needed.
Guenther
2011-05-06 10:48:10 +02:00
Gregor Beck
7d040434dc s3-net: fix the usage output of "net idmap check"
Signed-off-by: Michael Adam <obnox@samba.org>
2011-04-07 13:13:27 +02:00
Gregor Beck
a217ec64ec s3-net: add command "net idmap check"
This is a tool to check the consistency of an idmap tdb database.

The default mode is to scan the database and list invalid entries,
e.g. records with an invalid format, or records which are valid
but for which the reverse mapping entry is missing.

With the "--repair" switch, one can enter an interactive
repair mode which will prompt for each invalid entry found
with the option to delete, skip or edit the record.

There is also a non-interactive repair mode triggered by "--auto"
which will remove all records with invalid content and fill up
mappings which are missing the reverse entry.

The "--test" parameter lets "net idmap check" only list the
changes that would be written and not actually commit them to
the database.

The "--lock" option allows to lock the database already in the
first reading traverse, in order to remove the race when the
database has to be closed and reopened again before writing
the changes.

Signed-off-by: Michael Adam <obnox@samba.org>

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Mon Apr  4 18:21:09 CEST 2011 on sn-devel-104
2011-04-04 18:21:09 +02:00
Günther Deschner
0e771263ee s3-includes: only include system/filesys.h when needed.
Guenther
2011-03-30 01:13:07 +02:00
Gregor Beck
927102790e s3:net idmap: implement net idmap delete
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Wed Feb  9 15:06:06 CET 2011 on sn-devel-104
2011-02-09 15:06:06 +01:00
Michael Adam
a6d45d0ad8 s3:net idmap dump: report correct database file when failed to open idmap db. 2011-02-09 14:00:35 +01:00
Gregor Beck
59ccfac211 s3:net idmap dump: use net_idmap_dbfile 2011-02-09 14:00:35 +01:00
Michael Adam
79307cf006 s3:net idmap restore: correctly abort operation if dbfile could not be determined 2011-02-09 14:00:34 +01:00
Michael Adam
92f856c513 s3:net idmap: fix error reporting in net_idmap_dbfile()
The last case which results in dbfile == NULL is not an
out of memory case but means no --db has been specified
and the idmap backend is not supported for auto-determining
the idmap tdb file.
2011-02-09 14:00:34 +01:00
Gregor Beck
e2795f5664 s3:net factor out net_idmap_dbfile 2011-02-09 14:00:34 +01:00
Gregor Beck
1f1a165ea9 s3:net idmap restore: fix segfault on missing input file 2011-02-09 14:00:34 +01:00
Gregor Beck
01d3da3c7c s3:net: remove unused net_idmap_help
Signed-off-by: Michael Adam <obnox@samba.org>

Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Tue Feb  8 11:50:37 CET 2011 on sn-devel-104
2011-02-08 11:50:37 +01:00
Michael Adam
45cb9bba37 s3:net: make idmap_store_secret static.
Autobuild-User: Michael Adam <obnox@samba.org>
Autobuild-Date: Sun Jan  2 13:41:07 CET 2011 on sn-devel-104
2011-01-02 13:41:07 +01:00
Michael Adam
7f256a740c s3:net: fix the usage for net idmap secret (removing alloc) 2011-01-02 12:51:55 +01:00
Michael Adam
11016f2a6b s3:net: remove alloc parameter from idmap_store_secret() (net idmap store). 2011-01-02 12:51:55 +01:00
Andrew Bartlett
f768b32e37 libcli/security Provide a common, top level libcli/security/security.h
This will reduce the noise from merges of the rest of the
libcli/security code, without this commit changing what code
is actually used.

This includes (along with other security headers) dom_sid.h and
security_token.h

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Tue Oct 12 05:54:10 UTC 2010 on sn-devel-104
2010-10-12 05:54:10 +00:00
Günther Deschner
7a05ca2c9c s3-build: use dbwrap.h only where needed.
Guenther
2010-08-26 00:25:55 +02:00
Günther Deschner
2b41f421fd s3-idmap: only include idmap headers where needed.
Guenther
2010-08-26 00:20:29 +02:00
Michael Adam
502d00e463 s3:net: remove the "net idmap secret alloc" functionality.
This is now not available any more, since allocation is moved
below the id mapping layer. The functionality could be
reintroduced on a per domain basis as an e.g
"net idmap secret <domain> alloc" command.
2010-08-14 02:10:41 +02:00
Michael Adam
a03e2cacaf s3:net: rewrite "net idmap restore" using dbwrap
This removes the use of libwbclient from "net idmap".

This detects the idmap backend from the current smb.conf
and stores the id mapping tables in the corresponding data bases.
Currently, only tdb and tdb2 backends are supported.
Support for the ldap backend may be implemented later.
2010-08-14 02:10:30 +02:00
Michael Adam
80bceab9cb s3:net: change "net idmap dump" to use dbwrap instead of direct tdb access
This way, it will also work in a samba-ctdb cluster.
2010-08-14 02:10:30 +02:00
Günther Deschner
c136b84f0d s3-secrets: only include secrets.h when needed.
Guenther
2010-08-05 10:12:25 +02:00
Andrew Bartlett
cba7f8b827 s3:dom_sid Global replace of DOM_SID with struct dom_sid
This matches the structure that new code is being written to,
and removes one more of the old-style named structures, and
the need to know that is is just an alias for struct dom_sid.

Andrew Bartlett

Signed-off-by: Günther Deschner <gd@samba.org>
2010-05-21 10:39:59 +02:00
Kai Blin
66de52c4f4 s3 net: Fix compile warnings 2010-01-19 14:48:34 +01:00
Kai Blin
09bc13728f s3 net/i18n: Use only one spelling for "Usage:" 2010-01-19 10:07:36 +01:00
Björn Jacke
bd3c922e2b s3/net: split up some printable stings to ease i18n
If we put strings like "Usage:" into separate _() macros and not the whole
"Usage:..." string we can cover much more messages by only one single
translation. The drawback is that the message in the sources looks less pretty.
2010-01-18 23:45:05 +01:00
Kai Blin
346c5cca44 s3 net: i18n support for net idmap 2009-07-30 12:04:53 +02:00
Kai Blin
255bdb2602 net: Rename functable3 to functable, get rid of old functables
(This used to be commit bb7c5fc4ec)
2008-06-10 09:48:21 +02:00
Kai Blin
6468d36716 net: Make "net idmap" use functable3
(This used to be commit 9c88b16beb)
2008-06-10 09:46:46 +02:00
Kai Blin
4206d97544 net: more whitespace cleanup
(This used to be commit ef0184d580)
2008-05-10 09:22:31 +02:00
Kai Blin
f576910944 net: Remove globals
(This used to be commit 1e9319cf88)
2008-05-10 09:22:27 +02:00