diff options
| author | Gerald Carter <jerry@samba.org> | 2007-05-06 21:04:30 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:21:49 -0500 |
| commit | c16059f1f0eab31835f577aa4985fd9d70a8982c (patch) | |
| tree | 76e1241da919617cf78f45c0fa9b14d4f5dd7a54 /source3/nsswitch/idmap.c | |
| parent | fd5ff711b6fa4b1146776ba6f915a20e64786c53 (diff) | |
| download | samba-c16059f1f0eab31835f577aa4985fd9d70a8982c.tar.gz samba-c16059f1f0eab31835f577aa4985fd9d70a8982c.tar.bz2 samba-c16059f1f0eab31835f577aa4985fd9d70a8982c.zip | |
r22713: Offline logon fixes for idmap manager:
(a) Ignore the negative cache when the domain is offline
(b) don't delete expired entries from the cache as these
can be used when offline (same model as thw wcache entries)
(c) Delay idmap backend initialization when offline
as the backend routines will not be called until we go
online anyways. This prevents idmap_init() from failing
when a backend's init() function fails becuase of lack of
network connectivity
(This used to be commit 4086ef15b395f1a536fb669af2103a33ecc14de4)
Diffstat (limited to 'source3/nsswitch/idmap.c')
| -rw-r--r-- | source3/nsswitch/idmap.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/source3/nsswitch/idmap.c b/source3/nsswitch/idmap.c index 73a30f6087..babd5645aa 100644 --- a/source3/nsswitch/idmap.c +++ b/source3/nsswitch/idmap.c @@ -282,8 +282,18 @@ NTSTATUS idmap_init(void) if ( !NT_STATUS_IS_OK(ret) ) return ret; - if (NT_STATUS_IS_OK(idmap_init_status)) + if (NT_STATUS_IS_OK(idmap_init_status)) { return NT_STATUS_OK; + } + + /* We can't reliably call intialization code here unless + we are online. But return NT_STATUS_OK so the upper + level code doesn't abort idmap lookups. */ + + if ( get_global_winbindd_state_offline() ) { + idmap_init_status = NT_STATUS_FILE_IS_OFFLINE; + return NT_STATUS_OK; + } static_init_idmap; @@ -1114,6 +1124,7 @@ NTSTATUS idmap_unixids_to_sids(struct id_map **ids) struct id_map **bids; int i, bi; int bn = 0; + struct winbindd_domain *our_domain = find_our_domain(); if (! NT_STATUS_IS_OK(ret = idmap_init())) { return ret; @@ -1179,6 +1190,11 @@ NTSTATUS idmap_unixids_to_sids(struct id_map **ids) /* let's see if there is any id mapping to be retieved from the backends */ if (bi) { + /* Only do query if we are online */ + if ( IS_DOMAIN_OFFLINE(our_domain) ) { + ret = NT_STATUS_FILE_IS_OFFLINE; + goto done; + } ret = idmap_backends_unixids_to_sids(bids); IDMAP_CHECK_RET(ret); @@ -1218,6 +1234,7 @@ NTSTATUS idmap_sids_to_unixids(struct id_map **ids) struct id_map **bids; int i, bi; int bn = 0; + struct winbindd_domain *our_domain = find_our_domain(); if (! NT_STATUS_IS_OK(ret = idmap_init())) { return ret; @@ -1284,6 +1301,11 @@ NTSTATUS idmap_sids_to_unixids(struct id_map **ids) /* let's see if there is any id mapping to be retieved from the backends */ if (bids) { + /* Only do query if we are online */ + if ( IS_DOMAIN_OFFLINE(our_domain) ) { + ret = NT_STATUS_FILE_IS_OFFLINE; + goto done; + } ret = idmap_backends_sids_to_unixids(bids); IDMAP_CHECK_RET(ret); |