diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-05-20 14:20:52 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-05-20 14:20:52 -0400 |
| commit | 55daaea86e0ba049d31f74fcdf6bfedc6e0a1e7b (patch) | |
| tree | 9d50c5c36326eb2feeaacd87ebfce183dfc5b65f /src/providers/dp_auth_util.c | |
| parent | 9e9f8f0765b2e5b7e8701773599109220a85d442 (diff) | |
| download | sssd-55daaea86e0ba049d31f74fcdf6bfedc6e0a1e7b.tar.gz sssd-55daaea86e0ba049d31f74fcdf6bfedc6e0a1e7b.tar.xz sssd-55daaea86e0ba049d31f74fcdf6bfedc6e0a1e7b.zip | |
Revert "Copy pam data from DBus message"
This reverts commit 2faf73eef14d66aeb345ffa38d0f53670fa8a9a1.
Diffstat (limited to 'src/providers/dp_auth_util.c')
| -rw-r--r-- | src/providers/dp_auth_util.c | 108 |
1 files changed, 41 insertions, 67 deletions
diff --git a/src/providers/dp_auth_util.c b/src/providers/dp_auth_util.c index f042f8ce5..e09a69243 100644 --- a/src/providers/dp_auth_util.c +++ b/src/providers/dp_auth_util.c @@ -23,7 +23,7 @@ bool dp_pack_pam_request(DBusMessage *msg, struct pam_data *pd) { - dbus_bool_t db_ret; + int ret; if (pd->user == NULL) return false; if (pd->service == NULL) pd->service = talloc_strdup(pd, ""); @@ -32,78 +32,52 @@ bool dp_pack_pam_request(DBusMessage *msg, struct pam_data *pd) if (pd->rhost == NULL) pd->rhost = talloc_strdup(pd, ""); - db_ret = dbus_message_append_args(msg, - DBUS_TYPE_INT32, &(pd->cmd), - DBUS_TYPE_STRING, &(pd->user), - DBUS_TYPE_STRING, &(pd->service), - DBUS_TYPE_STRING, &(pd->tty), - DBUS_TYPE_STRING, &(pd->ruser), - DBUS_TYPE_STRING, &(pd->rhost), - DBUS_TYPE_UINT32, &(pd->authtok_type), - DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, - &(pd->authtok), - (pd->authtok_size), - DBUS_TYPE_UINT32, &(pd->newauthtok_type), - DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, - &(pd->newauthtok), - pd->newauthtok_size, - DBUS_TYPE_INT32, &(pd->priv), - DBUS_TYPE_UINT32, &(pd->cli_pid), - DBUS_TYPE_INVALID); - - return db_ret; -} - -bool dp_unpack_pam_request(DBusMessage *msg, TALLOC_CTX *mem_ctx, - struct pam_data **new_pd, DBusError *dbus_error) -{ - dbus_bool_t db_ret; - int ret; - struct pam_data pd; - - memset(&pd, 0, sizeof(pd)); - - db_ret = dbus_message_get_args(msg, dbus_error, - DBUS_TYPE_INT32, &(pd.cmd), - DBUS_TYPE_STRING, &(pd.user), - DBUS_TYPE_STRING, &(pd.service), - DBUS_TYPE_STRING, &(pd.tty), - DBUS_TYPE_STRING, &(pd.ruser), - DBUS_TYPE_STRING, &(pd.rhost), - DBUS_TYPE_UINT32, &(pd.authtok_type), + ret = dbus_message_append_args(msg, + DBUS_TYPE_INT32, &(pd->cmd), + DBUS_TYPE_STRING, &(pd->user), + DBUS_TYPE_STRING, &(pd->service), + DBUS_TYPE_STRING, &(pd->tty), + DBUS_TYPE_STRING, &(pd->ruser), + DBUS_TYPE_STRING, &(pd->rhost), + DBUS_TYPE_UINT32, &(pd->authtok_type), DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, - &(pd.authtok), - &(pd.authtok_size), - DBUS_TYPE_UINT32, &(pd.newauthtok_type), + &(pd->authtok), + (pd->authtok_size), + DBUS_TYPE_UINT32, &(pd->newauthtok_type), DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, - &(pd.newauthtok), - &(pd.newauthtok_size), - DBUS_TYPE_INT32, &(pd.priv), - DBUS_TYPE_UINT32, &(pd.cli_pid), + &(pd->newauthtok), + pd->newauthtok_size, + DBUS_TYPE_INT32, &(pd->priv), + DBUS_TYPE_UINT32, &(pd->cli_pid), DBUS_TYPE_INVALID); - if (!db_ret) { - DEBUG(1, ("dbus_message_get_args failed.\n")); - return false; - } - - ret = copy_pam_data(mem_ctx, &pd, new_pd); - if (ret != EOK) { - DEBUG(1, ("copy_pam_data failed.\n")); - return false; - } - - if (pd.authtok_size != 0 && pd.authtok != NULL) { - memset(pd.authtok, 0, pd.authtok_size); - pd.authtok_size = 0; - } + return ret; +} - if (pd.newauthtok_size != 0 && pd.newauthtok != NULL) { - memset(pd.newauthtok, 0, pd.newauthtok_size); - pd.newauthtok_size = 0; - } +bool dp_unpack_pam_request(DBusMessage *msg, struct pam_data *pd, DBusError *dbus_error) +{ + int ret; - return true; + ret = dbus_message_get_args(msg, dbus_error, + DBUS_TYPE_INT32, &(pd->cmd), + DBUS_TYPE_STRING, &(pd->user), + DBUS_TYPE_STRING, &(pd->service), + DBUS_TYPE_STRING, &(pd->tty), + DBUS_TYPE_STRING, &(pd->ruser), + DBUS_TYPE_STRING, &(pd->rhost), + DBUS_TYPE_UINT32, &(pd->authtok_type), + DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, + &(pd->authtok), + &(pd->authtok_size), + DBUS_TYPE_UINT32, &(pd->newauthtok_type), + DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE, + &(pd->newauthtok), + &(pd->newauthtok_size), + DBUS_TYPE_INT32, &(pd->priv), + DBUS_TYPE_UINT32, &(pd->cli_pid), + DBUS_TYPE_INVALID); + + return ret; } bool dp_pack_pam_response(DBusMessage *msg, struct pam_data *pd) |