From 376eaf187c13c2a1eaea0ffbdd970b6b563ab74c Mon Sep 17 00:00:00 2001 From: Petr Cech Date: Sep 14 2015 14:00:49 +0000 Subject: DATA_PROVIDER: BE_REQ as string in log message Add be_req2str() for translation BE_REQ to string. So we will have || Got request for [0x1001][FAST BE_REQ_USER][1][name=celestian] instead of || Got request for [0x1001][1][name=celestian] Function be_req2str() is used in data provider and in responder too. So this patch create new header file data_provider_req.h which delivers function be_req2str() and definitions of BE_REQ_*. Resolves: https://fedorahosted.org/sssd/ticket/2708 Reviewed-by: Pavel Reichl --- diff --git a/Makefile.am b/Makefile.am index 851f943..dc0670a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -449,7 +449,8 @@ SSSD_RESPONDER_OBJ = \ src/monitor/monitor_iface_generated.c \ src/monitor/monitor_iface_generated.h \ src/providers/data_provider_iface_generated.c \ - src/providers/data_provider_iface_generated.h + src/providers/data_provider_iface_generated.h \ + src/providers/data_provider_req.c SSSD_TOOLS_OBJ = \ src/tools/sss_sync_ops.c \ @@ -587,6 +588,7 @@ dist_noinst_HEADERS = \ src/confdb/confdb_private.h \ src/confdb/confdb_setup.h \ src/providers/data_provider.h \ + src/providers/data_provider_req.h \ src/providers/dp_backend.h \ src/providers/dp_dyndns.h \ src/providers/dp_ptask_private.h \ @@ -1201,6 +1203,7 @@ endif sssd_be_SOURCES = \ src/providers/data_provider_be.c \ + src/providers/data_provider_req.c \ src/providers/data_provider_fo.c \ src/providers/data_provider_opts.c \ src/providers/data_provider_callbacks.c \ diff --git a/src/providers/data_provider.h b/src/providers/data_provider.h index 510c63c..39051b9 100644 --- a/src/providers/data_provider.h +++ b/src/providers/data_provider.h @@ -43,6 +43,7 @@ #include "sbus/sbus_client.h" #include "sss_client/sss_cli.h" #include "util/authtok.h" +#include "providers/data_provider_req.h" #include "providers/data_provider_iface_generated.h" #define DATA_PROVIDER_VERSION 0x0001 @@ -131,22 +132,6 @@ #define BE_FILTER_CERT 6 #define BE_FILTER_WILDCARD 7 -#define BE_REQ_USER 0x0001 -#define BE_REQ_GROUP 0x0002 -#define BE_REQ_INITGROUPS 0x0003 -#define BE_REQ_NETGROUP 0x0004 -#define BE_REQ_SERVICES 0x0005 -#define BE_REQ_SUDO_FULL 0x0006 -#define BE_REQ_SUDO_RULES 0x0007 -#define BE_REQ_AUTOFS 0x0009 -#define BE_REQ_HOST 0x0010 -#define BE_REQ_BY_SECID 0x0011 -#define BE_REQ_USER_AND_GROUP 0x0012 -#define BE_REQ_BY_UUID 0x0013 -#define BE_REQ_BY_CERT 0x0014 -#define BE_REQ_TYPE_MASK 0x00FF -#define BE_REQ_FAST 0x1000 - #define DP_SEC_ID "secid" #define DP_CERT "cert" /* sizeof() counts the trailing \0 so we must substract 1 for the string diff --git a/src/providers/data_provider_be.c b/src/providers/data_provider_be.c index d147630..d71a69c 100644 --- a/src/providers/data_provider_be.c +++ b/src/providers/data_provider_be.c @@ -1104,7 +1104,8 @@ static int be_get_account_info(struct sbus_request *dbus_req, void *user_data) return EOK; /* handled */ DEBUG(SSSDBG_FUNC_DATA, - "Got request for [%#x][%d][%s]\n", type, attr_type, filter); + "Got request for [%#x][%s][%d][%s]\n", type, be_req2str(type), + attr_type, filter); /* If we are offline and fast reply was requested * return offline immediately diff --git a/src/providers/data_provider_req.c b/src/providers/data_provider_req.c new file mode 100644 index 0000000..94aacb6 --- /dev/null +++ b/src/providers/data_provider_req.c @@ -0,0 +1,58 @@ +/* + SSSD + + Data Provider -- backend request + + Copyright (C) Petr Cech 2015 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include "providers/data_provider_req.h" + +#define be_req_to_str(req_type, be_req_t) \ + ((req_type) & BE_REQ_FAST) ? "FAST " #be_req_t : #be_req_t + +const char *be_req2str(dbus_uint32_t req_type) +{ + switch (req_type & BE_REQ_TYPE_MASK) { + case BE_REQ_USER: + return be_req_to_str(req_type, BE_REQ_USER); + case BE_REQ_GROUP: + return be_req_to_str(req_type, BE_REQ_GROUP); + case BE_REQ_INITGROUPS: + return be_req_to_str(req_type, BE_REQ_INITGROUPS); + case BE_REQ_NETGROUP: + return be_req_to_str(req_type, BE_REQ_NETGROUP); + case BE_REQ_SERVICES: + return be_req_to_str(req_type, BE_REQ_SERVICES); + case BE_REQ_SUDO_FULL: + return be_req_to_str(req_type, BE_REQ_SUDO_FULL); + case BE_REQ_SUDO_RULES: + return be_req_to_str(req_type, BE_REQ_SUDO_RULES); + case BE_REQ_AUTOFS: + return be_req_to_str(req_type, BE_REQ_AUTOFS); + case BE_REQ_HOST: + return be_req_to_str(req_type, BE_REQ_HOST); + case BE_REQ_BY_SECID: + return be_req_to_str(req_type, BE_REQ_BY_SECID); + case BE_REQ_USER_AND_GROUP: + return be_req_to_str(req_type, BE_REQ_USER_AND_GROUP); + case BE_REQ_BY_UUID: + return be_req_to_str(req_type, BE_REQ_BY_UUID); + case BE_REQ_BY_CERT: + return be_req_to_str(req_type, BE_REQ_BY_CERT); + } + return "UNKNOWN_REQ"; +} diff --git a/src/providers/data_provider_req.h b/src/providers/data_provider_req.h new file mode 100644 index 0000000..338f819 --- /dev/null +++ b/src/providers/data_provider_req.h @@ -0,0 +1,51 @@ +/* + SSSD + + Data Provider -- backend request + + Copyright (C) Petr Cech 2015 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __DATA_PROVIDER_REQ__ +#define __DATA_PROVIDER_REQ__ + +#include + +#define BE_REQ_USER 0x0001 +#define BE_REQ_GROUP 0x0002 +#define BE_REQ_INITGROUPS 0x0003 +#define BE_REQ_NETGROUP 0x0004 +#define BE_REQ_SERVICES 0x0005 +#define BE_REQ_SUDO_FULL 0x0006 +#define BE_REQ_SUDO_RULES 0x0007 +#define BE_REQ_AUTOFS 0x0009 +#define BE_REQ_HOST 0x0010 +#define BE_REQ_BY_SECID 0x0011 +#define BE_REQ_USER_AND_GROUP 0x0012 +#define BE_REQ_BY_UUID 0x0013 +#define BE_REQ_BY_CERT 0x0014 +#define BE_REQ_TYPE_MASK 0x00FF +#define BE_REQ_FAST 0x1000 + +/** + * @brief Convert request type to string for logging purpose. + * + * @param[in] req_type Type of request. + * @return Pointer to string with request type. There could be 'fast' flag. + */ +const char *be_req2str(dbus_uint32_t req_type); + +#endif /* __DATA_PROVIDER_REQ__ */ diff --git a/src/responder/common/responder_dp.c b/src/responder/common/responder_dp.c index f7f8df0..d1c1609 100644 --- a/src/responder/common/responder_dp.c +++ b/src/responder/common/responder_dp.c @@ -620,8 +620,8 @@ sss_dp_get_account_msg(void *pvt) /* create the message */ DEBUG(SSSDBG_TRACE_FUNC, - "Creating request for [%s][%u][%d][%s]\n", - info->dom->name, be_type, attrs, filter); + "Creating request for [%s][%#x][%s][%d][%s]\n", + info->dom->name, be_type, be_req2str(be_type), attrs, filter); dbret = dbus_message_append_args(msg, DBUS_TYPE_UINT32, &be_type,