more debugging info

This commit is contained in:
Nikos Mavrogiannopoulos
2014-01-11 21:46:10 +01:00
parent 770004032e
commit 77ecb0461b

View File

@@ -597,8 +597,14 @@ static void info_common(main_server_st * s, DBusConnection * conn,
DBusMessageIter suba;
DBusMessageIter subs;
int ret;
unsigned found_user = 0;
struct proc_st *ctmp = NULL;
if (user != NULL)
mslog(s, NULL, LOG_INFO, "providing info for user '%s'", user);
else
mslog(s, NULL, LOG_INFO, "providing info for ID '%u'", id);
/* no arguments needed */
reply = dbus_message_new_method_return(msg);
if (reply == NULL) {
@@ -645,6 +651,8 @@ static void info_common(main_server_st * s, DBusConnection * conn,
goto error;
}
found_user = 1;
if (id != 0) /* id -> one a single element */
break;
}
@@ -655,6 +663,15 @@ static void info_common(main_server_st * s, DBusConnection * conn,
goto error;
}
if (found_user == 0) {
if (user != NULL)
mslog(s, NULL, LOG_INFO, "could not find user '%s'",
user);
else
mslog(s, NULL, LOG_INFO, "could not find ID '%u'", id);
goto error;
}
if (!dbus_connection_send(conn, reply, NULL)) {
mslog(s, NULL, LOG_ERR, "error sending dbus reply");
goto error;
@@ -672,7 +689,7 @@ static void method_user_info(main_server_st * s, DBusConnection * conn,
DBusMessageIter args;
const char *name;
mslog(s, NULL, LOG_DEBUG, "ctl: user_info");
mslog(s, NULL, LOG_DEBUG, "ctl: user_info (name)");
if (dbus_message_iter_init(msg, &args) == 0) {
mslog(s, NULL, LOG_ERR, "no arguments provided in user_info");
@@ -697,7 +714,7 @@ static void method_id_info(main_server_st * s, DBusConnection * conn,
DBusMessageIter args;
dbus_uint32_t id;
mslog(s, NULL, LOG_DEBUG, "ctl: user_info");
mslog(s, NULL, LOG_DEBUG, "ctl: user_info (id)");
if (dbus_message_iter_init(msg, &args) == 0) {
mslog(s, NULL, LOG_ERR, "no arguments provided in user_info");