summaryrefslogtreecommitdiff
path: root/source3/winbindd
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-11-13 20:28:41 -0800
committerJeremy Allison <jra@samba.org>2010-11-14 04:39:05 +0000
commit781c4aabb87e63df77c76a360b6ed5f6a20e6d58 (patch)
treee53eb195b8116ab29b73c34c3f00474b9c137d0c /source3/winbindd
parent7cb0f95bf28c24c45955d6df52f505019341ef31 (diff)
downloadsamba-781c4aabb87e63df77c76a360b6ed5f6a20e6d58.tar.gz
samba-781c4aabb87e63df77c76a360b6ed5f6a20e6d58.tar.bz2
samba-781c4aabb87e63df77c76a360b6ed5f6a20e6d58.zip
Move error reporting of messaging context creation fail into
the daemons themselves. Allows client utilities to silently fail to create a messaging context due to access denied on the messaging tdb (which I need for the following patch). Jeremy.
Diffstat (limited to 'source3/winbindd')
-rw-r--r--source3/winbindd/winbindd.c10
-rw-r--r--source3/winbindd/winbindd.h1
2 files changed, 10 insertions, 1 deletions
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index c831c94221..43cbd50d15 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -44,6 +44,16 @@ static bool interactive = False;
extern bool override_logfile;
+struct messaging_context *winbind_messaging_context(void)
+{
+ struct messaging_context *msg_ctx = server_messaging_context();
+ if (likely(msg_ctx != NULL)) {
+ return msg_ctx;
+ }
+ smb_panic("Could not init winbindd's messaging context.\n");
+ return NULL;
+}
+
/* Reload configuration */
static bool reload_services_file(const char *lfile)
diff --git a/source3/winbindd/winbindd.h b/source3/winbindd/winbindd.h
index 1ba24b5d0a..d276b86947 100644
--- a/source3/winbindd/winbindd.h
+++ b/source3/winbindd/winbindd.h
@@ -388,6 +388,5 @@ struct WINBINDD_CCACHE_ENTRY {
#define DOM_SEQUENCE_NONE ((uint32)-1)
#define winbind_event_context server_event_context
-#define winbind_messaging_context server_messaging_context
#endif /* _WINBINDD_H */