diff options
| author | Jeremy Allison <jra@samba.org> | 2009-01-29 15:27:42 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2009-01-29 15:27:42 -0800 |
| commit | 164fd3cb3398b14fa02f13e5618465678b27ad07 (patch) | |
| tree | 5c427a1e145d0e922d65339b0ffe56db2911908c | |
| parent | d177015a6d43fcc26a823e52b86850a82261ad4d (diff) | |
| parent | aeb23872e25fb720140a10ce01a4211d228b6555 (diff) | |
| download | samba-164fd3cb3398b14fa02f13e5618465678b27ad07.tar.gz samba-164fd3cb3398b14fa02f13e5618465678b27ad07.tar.bz2 samba-164fd3cb3398b14fa02f13e5618465678b27ad07.zip | |
Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba
| -rw-r--r-- | source3/include/idmap.h | 5 | ||||
| -rw-r--r-- | source3/include/proto.h | 2 | ||||
| -rw-r--r-- | source3/winbindd/idmap_tdb.c | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/source3/include/idmap.h b/source3/include/idmap.h index 4322192155..672e373108 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 e00d644852..af5181eca6 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 99821ae501..481ac1b9ad 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" |