From a06644dfe4f680d6b14f7e654aad4982ea10a6cc Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Fri, 27 Mar 2009 14:52:21 -0400 Subject: Fix potential segfault if dp_ctx is still NULL. May happen at startup if, for some reason dp is very slow to start and we receive a request before a reconnection is rescheduled in the responder dp reconnection code. This shouldn't happen normally so make it clear with a debug statement. --- server/responder/pam/pamsrv_dp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'server/responder/pam') diff --git a/server/responder/pam/pamsrv_dp.c b/server/responder/pam/pamsrv_dp.c index 9bd249e2..5eaf7d14 100644 --- a/server/responder/pam/pamsrv_dp.c +++ b/server/responder/pam/pamsrv_dp.c @@ -95,7 +95,6 @@ int pam_dp_send_req(struct cli_ctx *cctx, DBusMessage *msg; DBusPendingCall *pending_reply; DBusConnection *conn; - DBusError dbus_error; dbus_bool_t ret; struct pam_reply_ctx *rctx; @@ -117,8 +116,16 @@ int pam_dp_send_req(struct cli_ctx *cctx, return EINVAL; } + /* double check dp_ctx has actually been initialized. + * in some pathological cases it may happen that nss starts up before + * dp connection code is actually able to establish a connection. + */ + if (!rctx->dp_ctx) { + DEBUG(1, ("The Data Provider connection is not available yet!" + " This maybe a bug, it shouldn't happen!\n")); + return EIO; + } conn = sbus_get_connection(cctx->rctx->dp_ctx->scon_ctx); - dbus_error_init(&dbus_error); msg = dbus_message_new_method_call(NULL, DP_CLI_PATH, -- cgit