diff options
author | Simo Sorce <idra@samba.org> | 2007-04-18 21:10:37 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:27 -0500 |
commit | 01be4914b37f7e5887f3ecd4ecc53fbd846fc22e (patch) | |
tree | 3a5c3f59ddb48c4c2a369c9999b98801615c6c0d /source3/include | |
parent | 256f506c5b060c37ee22ee9ff0c371154721252a (diff) | |
download | samba-01be4914b37f7e5887f3ecd4ecc53fbd846fc22e.tar.gz samba-01be4914b37f7e5887f3ecd4ecc53fbd846fc22e.tar.bz2 samba-01be4914b37f7e5887f3ecd4ecc53fbd846fc22e.zip |
r22343: Commit to 3_0 as well after adapting the patch.
(tdb_delete_bystring instead of tdb_delete is used here)
(This used to be commit ee40cead097ed2c005f5f80b24c9f681e054849a)
Diffstat (limited to 'source3/include')
-rw-r--r-- | source3/include/idmap.h | 4 | ||||
-rw-r--r-- | source3/include/smb.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/source3/include/idmap.h b/source3/include/idmap.h index 80bd541a23..472358a230 100644 --- a/source3/include/idmap.h +++ b/source3/include/idmap.h @@ -42,13 +42,15 @@ struct idmap_domain { BOOL readonly; void *private_data; struct idmap_methods *methods; + BOOL initialized; + const char *params; }; /* Filled out by IDMAP backends */ struct idmap_methods { /* Called when backend is first loaded */ - NTSTATUS (*init)(struct idmap_domain *dom, const char *compat_params); + NTSTATUS (*init)(struct idmap_domain *dom); NTSTATUS (*unixids_to_sids)(struct idmap_domain *dom, struct id_map **ids); NTSTATUS (*sids_to_unixids)(struct idmap_domain *dom, struct id_map **ids); diff --git a/source3/include/smb.h b/source3/include/smb.h index a9c57f77f2..f85201ed30 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -278,7 +278,8 @@ typedef struct dom_sid { enum id_mapping { ID_UNKNOWN, ID_MAPPED, - ID_UNMAPPED + ID_UNMAPPED, + ID_EXPIRED }; enum id_type { |