[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha6-217-gaeb2387

[Michael Adam]

The branch, master has been updated
       via  aeb23872e25fb720140a10ce01a4211d228b6555 (commit)
       via  f2224e53b23ffdc0157330527585649c0e5ca635 (commit)
      from  a44649cf98ea8f45537ff9a65be69d621c002505 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit aeb23872e25fb720140a10ce01a4211d228b6555
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jan 22 12:34:43 2009 +0100

    s3:proto.h: remove duplicate prototypes.
    
    Michael

commit f2224e53b23ffdc0157330527585649c0e5ca635
Author: Michael Adam <obnox at samba.org>
Date:   Thu Jan 22 10:24:40 2009 +0100

    s3:idmap: move IDMAP_VERSION to the idmap tdb backend, where it belogns.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/include/idmap.h      |    5 -----
 source3/include/proto.h      |    2 --
 source3/winbindd/idmap_tdb.c |    5 +++++
 3 files changed, 5 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/idmap.h b/source3/include/idmap.h
index 4322192..672e373 100644
--- a/source3/include/idmap.h
+++ b/source3/include/idmap.h
@@ -22,11 +22,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-/* idmap version determines auto-conversion - this is the database
-   structure version specifier. */
-
-#define IDMAP_VERSION 2
-
 /* The interface version specifier. 
    Updated to 3 for enum types by JRA. */
 
diff --git a/source3/include/proto.h b/source3/include/proto.h
index e00d644..af5181e 100644
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1674,8 +1674,6 @@ bool winbind_lookup_rids(TALLOC_CTX *mem_ctx,
 			 int num_rids, uint32 *rids,
 			 const char **domain_name,
 			 const char ***names, enum lsa_SidType **types);
-bool winbind_allocate_uid(uid_t *uid);
-bool winbind_allocate_gid(gid_t *gid);
 
 /* The following definitions come from lib/wins_srv.c  */
 
diff --git a/source3/winbindd/idmap_tdb.c b/source3/winbindd/idmap_tdb.c
index 99821ae..481ac1b 100644
--- a/source3/winbindd/idmap_tdb.c
+++ b/source3/winbindd/idmap_tdb.c
@@ -28,6 +28,11 @@
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_IDMAP
 
+/* idmap version determines auto-conversion - this is the database
+   structure version specifier. */
+
+#define IDMAP_VERSION 2
+
 /* High water mark keys */
 #define HWM_GROUP  "GROUP HWM"
 #define HWM_USER   "USER HWM"


-- 
Samba Shared Repository