[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Tue May 31 11:48:01 MDT 2011
The branch, master has been updated
via cfef10a s3:doc: clean up the example section of the idmap_tdb manpage
via c3fecc6 winbindd.8: Use new idmap syntax for smbconfoptions
via c0fc7aa s3:passdb: add GPL/copyright header to machine_sid.h
via fdd225c s3:nmbd: add _NMBD_NMBD_H_ guard to nmbd.h
via 75cfafd s3:nmbd: add GPL/Copyright header to nmbd.h
via e403315 s3:rpc_server: add _RPC_SERVER_SRV_ACCESS_CHECK_H_ guard to srv_access_check.h
via 942ae87 s3:rpc_server: add GPL/Copyright header to rpc_server/srv_access_check.h
via c2887f0 s3: add _LIB_IDMAP_CACHE_H_ guard to lib/idmap_cache.h
via 2b8803d s3: add GPL/Copyright header to lib/idmap_cache.h
from 65f0800 replace: remove waring if IOV_MAX is not defined
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit cfef10a0a2a16221eac27b6b7d3b3d7d952a418e
Author: Michael Adam <obnox at samba.org>
Date: Tue May 31 18:09:14 2011 +0200
s3:doc: clean up the example section of the idmap_tdb manpage
Autobuild-User: Michael Adam <obnox at samba.org>
Autobuild-Date: Tue May 31 19:47:45 CEST 2011 on sn-devel-104
commit c3fecc6bdc7a06516a53189115a986f2cd0f42cc
Author: Luk Claes <luk at debian.org>
Date: Tue May 31 17:21:09 2011 +0200
winbindd.8: Use new idmap syntax for smbconfoptions
Signed-off-by: Luk Claes <luk at debian.org>
Signed-off-by: Michael Adam <obnox at samba.org>
commit c0fc7aa129c25664c76b3fdb4b9150c63fe3dd70
Author: Michael Adam <obnox at samba.org>
Date: Tue May 31 14:32:40 2011 +0200
s3:passdb: add GPL/copyright header to machine_sid.h
commit fdd225c3e41ed5a81ef02d39ac037818bde49c03
Author: Michael Adam <obnox at samba.org>
Date: Tue May 31 13:30:34 2011 +0200
s3:nmbd: add _NMBD_NMBD_H_ guard to nmbd.h
commit 75cfafd69864fccacd1e6c3ca8d27b42a48dbe1c
Author: Michael Adam <obnox at samba.org>
Date: Tue May 31 13:29:34 2011 +0200
s3:nmbd: add GPL/Copyright header to nmbd.h
commit e40331552137f513c6c2404d96adcf421212ec86
Author: Michael Adam <obnox at samba.org>
Date: Tue May 31 13:25:34 2011 +0200
s3:rpc_server: add _RPC_SERVER_SRV_ACCESS_CHECK_H_ guard to srv_access_check.h
commit 942ae874b85570f44b3257c8d229792ede7f8fd9
Author: Michael Adam <obnox at samba.org>
Date: Tue May 31 13:24:24 2011 +0200
s3:rpc_server: add GPL/Copyright header to rpc_server/srv_access_check.h
commit c2887f060954bd0e77bc6f3ac8fedec38e26c168
Author: Michael Adam <obnox at samba.org>
Date: Tue May 31 13:19:52 2011 +0200
s3: add _LIB_IDMAP_CACHE_H_ guard to lib/idmap_cache.h
commit 2b8803d458465508d0f4299248d858b9c393323e
Author: Michael Adam <obnox at samba.org>
Date: Tue May 31 13:18:51 2011 +0200
s3: add GPL/Copyright header to lib/idmap_cache.h
-----------------------------------------------------------------------
Summary of changes:
docs-xml/manpages-3/idmap_tdb.8.xml | 23 +---------------------
docs-xml/manpages-3/winbindd.8.xml | 13 ++++-------
source3/lib/idmap_cache.h | 25 ++++++++++++++++++++++++
source3/nmbd/nmbd.h | 25 ++++++++++++++++++++++++
source3/passdb/machine_sid.h | 21 ++++++++++++++++++++
source3/rpc_server/srv_access_check.h | 34 +++++++++++++++++++++++++++++++++
6 files changed, 111 insertions(+), 30 deletions(-)
Changeset truncated at 500 lines:
diff --git a/docs-xml/manpages-3/idmap_tdb.8.xml b/docs-xml/manpages-3/idmap_tdb.8.xml
index cd024e8..c67d6cb 100644
--- a/docs-xml/manpages-3/idmap_tdb.8.xml
+++ b/docs-xml/manpages-3/idmap_tdb.8.xml
@@ -50,8 +50,7 @@
<para>
This example shows how tdb is used as a the default idmap backend.
- It configures the idmap range through the global options for all
- domains encountered. This same range is used for uid/gid allocation.
+ This configured range is used for uid and gid allocation.
</para>
<programlisting>
@@ -60,26 +59,6 @@
idmap config * : backend = tdb
idmap config * : range = 1000000-2000000
</programlisting>
-
- <para>
- This (rather theoretical) example shows how tdb can be used as the
- allocating backend while ldap is the default backend used to store
- the mappings.
- It adds an explicit configuration for some domain DOM1, that
- uses the tdb idmap backend. Note that the same range as the
- default uid/gid range is used, since the allocator has to serve
- both the default backend and the explicitly configured domain DOM1.
- </para>
-
- <programlisting>
- [global]
- idmap config * : backend = ldap
- idmap config * : range = 1000000-2000000
- # use a different uid/gid allocator:
-
- idmap config DOM1 : backend = tdb
- idmap config DOM1 : range = 1000000-2000000
- </programlisting>
</refsect1>
<refsect1>
diff --git a/docs-xml/manpages-3/winbindd.8.xml b/docs-xml/manpages-3/winbindd.8.xml
index c46371e..df44e44 100644
--- a/docs-xml/manpages-3/winbindd.8.xml
+++ b/docs-xml/manpages-3/winbindd.8.xml
@@ -46,9 +46,8 @@
service to <command>smbd</command>, <command>ntlm_auth</command>
and the <command>pam_winbind.so</command> PAM module, by managing connections to
domain controllers. In this configuration the
- <smbconfoption name="idmap uid"/> and
- <smbconfoption name="idmap gid"/>
- parameters are not required. (This is known as `netlogon proxy only mode'.)</para>
+ <smbconfoption name="idmap config * : range"/>
+ parameter is not required. (This is known as `netlogon proxy only mode'.)</para>
<para> The Name Service Switch allows user
and system information to be obtained from different databases
@@ -246,11 +245,9 @@ hosts: files wins
<listitem><para>
<smbconfoption name="winbind separator"/></para></listitem>
<listitem><para>
- <smbconfoption name="idmap uid"/></para></listitem>
+ <smbconfoption name="idmap config * : range"/></para></listitem>
<listitem><para>
- <smbconfoption name="idmap gid"/></para></listitem>
- <listitem><para>
- <smbconfoption name="idmap backend"/></para></listitem>
+ <smbconfoption name="idmap config * : backend"/></para></listitem>
<listitem><para>
<smbconfoption name="winbind cache time"/></para></listitem>
<listitem><para>
@@ -373,7 +370,7 @@ auth required /lib/security/pam_unix.so \
<para>If more than one UNIX machine is running <command>winbindd</command>,
then in general the user and groups ids allocated by winbindd will not
be the same. The user and group ids will only be valid for the local
- machine, unless a shared <smbconfoption name="idmap backend"/> is configured.</para>
+ machine, unless a shared <smbconfoption name="idmap config * : backend"/> is configured.</para>
<para>If the the Windows NT SID to UNIX user and group id mapping
file is damaged or destroyed then the mappings will be lost. </para>
diff --git a/source3/lib/idmap_cache.h b/source3/lib/idmap_cache.h
index af2ba82..1a62dba 100644
--- a/source3/lib/idmap_cache.h
+++ b/source3/lib/idmap_cache.h
@@ -1,3 +1,26 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * ID Mapping Cache
+ *
+ * Copyright (C) Volker Lendecke 2008
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _LIB_IDMAP_CACHE_H_
+#define _LIB_IDMAP_CACHE_H_
+
/* The following definitions come from lib/idmap_cache.c */
bool idmap_cache_find_sid2uid(const struct dom_sid *sid, uid_t *puid,
@@ -12,3 +35,5 @@ void idmap_cache_set_sid2gid(const struct dom_sid *sid, gid_t gid);
bool idmap_cache_del_uid(uid_t uid);
bool idmap_cache_del_gid(gid_t gid);
bool idmap_cache_del_sid(const struct dom_sid *sid);
+
+#endif /* _LIB_IDMAP_CACHE_H_ */
diff --git a/source3/nmbd/nmbd.h b/source3/nmbd/nmbd.h
index e100e7d..47940e1 100644
--- a/source3/nmbd/nmbd.h
+++ b/source3/nmbd/nmbd.h
@@ -1,6 +1,31 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * NBT netbios routines and daemon - version 2
+ *
+ * Copyright (C) Guenther Deschner 2011
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _NMBD_NMBD_H_
+#define _NMBD_NMBD_H_
+
#ifndef HAVE_PIPE
#define SYNC_DNS 1
#endif
#include "libsmb/nmblib.h"
#include "nmbd/nmbd_proto.h"
+
+#endif /* _NMBD_NMBD_H_ */
diff --git a/source3/passdb/machine_sid.h b/source3/passdb/machine_sid.h
index 2da281a..12fde2f 100644
--- a/source3/passdb/machine_sid.h
+++ b/source3/passdb/machine_sid.h
@@ -1,3 +1,24 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Password and authentication handling
+ * Copyright (C) Jeremy Allison 1996-2002
+ * Copyright (C) Andrew Tridgell 2002
+ * Copyright (C) Gerald (Jerry) Carter 2000
+ * Copyright (C) Stefan (metze) Metzmacher 2002
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
/* The following definitions come from passdb/machine_sid.c */
diff --git a/source3/rpc_server/srv_access_check.h b/source3/rpc_server/srv_access_check.h
index 27a09bd..72ce539 100644
--- a/source3/rpc_server/srv_access_check.h
+++ b/source3/rpc_server/srv_access_check.h
@@ -1,3 +1,35 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * RPC Pipe client / server routines
+ * Copyright (C) Andrew Tridgell 1992-1997,
+ * Copyright (C) Luke Kenneth Casson Leighton 1996-1997,
+ * Copyright (C) Paul Ashton 1997,
+ * Copyright (C) Marc Jacobsen 1999,
+ * Copyright (C) Jeremy Allison 2001-2008,
+ * Copyright (C) Jean François Micouleau 1998-2001,
+ * Copyright (C) Jim McDonough <jmcd at us.ibm.com> 2002,
+ * Copyright (C) Gerald (Jerry) Carter 2003-2004,
+ * Copyright (C) Simo Sorce 2003.
+ * Copyright (C) Volker Lendecke 2005.
+ * Copyright (C) Guenther Deschner 2008.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef _RPC_SERVER_SRV_ACCESS_CHECK_H_
+#define _RPC_SERVER_SRV_ACCESS_CHECK_H_
+
/* The following definitions come from rpc_server/srv_access_check.c */
NTSTATUS access_check_object( struct security_descriptor *psd, struct security_token *token,
@@ -8,3 +40,5 @@ NTSTATUS access_check_object( struct security_descriptor *psd, struct security_t
void map_max_allowed_access(const struct security_token *nt_token,
const struct security_unix_token *unix_token,
uint32_t *pacc_requested);
+
+#endif /* _RPC_SERVER_SRV_ACCESS_CHECK_H_ */
--
Samba Shared Repository
More information about the samba-cvs
mailing list