diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-11 03:12:21 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-11 03:12:21 +0200 |
commit | 0fd0fc75c46b39a611c7f9a56081105714d73e36 (patch) | |
tree | b93ef5e67e49a3aa49c37e13df3d6222b2df7095 /source3/include/idmap.h | |
parent | 69d38a95c29498c0266cb98b911faa3e7240c787 (diff) | |
parent | 47f7ef8f39ba482a7d6578ab82c9e0670381c4f8 (diff) | |
download | samba-0fd0fc75c46b39a611c7f9a56081105714d73e36.tar.gz samba-0fd0fc75c46b39a611c7f9a56081105714d73e36.tar.bz2 samba-0fd0fc75c46b39a611c7f9a56081105714d73e36.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into selftest
Conflicts:
selftest/selftest.pl
Diffstat (limited to 'source3/include/idmap.h')
-rw-r--r-- | source3/include/idmap.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/include/idmap.h b/source3/include/idmap.h index 95c3e4c0c2..4322192155 100644 --- a/source3/include/idmap.h +++ b/source3/include/idmap.h @@ -31,8 +31,9 @@ Updated to 3 for enum types by JRA. */ /* Updated to 4, completely new interface, SSS */ +/* Updated to 5, simplified interface by Volker */ -#define SMB_IDMAP_INTERFACE_VERSION 4 +#define SMB_IDMAP_INTERFACE_VERSION 5 struct idmap_domain { const char *name; |