diff --git a/sesman/libsesman/sesman_auth.h b/sesman/libsesman/sesman_auth.h index e27684e9..61537ab2 100644 --- a/sesman/libsesman/sesman_auth.h +++ b/sesman/libsesman/sesman_auth.h @@ -53,6 +53,7 @@ auth_userpass(const char *user, const char *pass, * * @param uid User ID * @param[out] Error code for the operation. E_SCP_LOGIN_OK on success. + * Can be NULL if this information isn't required. * @return auth handle on success, NULL on failure * */ @@ -66,20 +67,12 @@ auth_uds(const char *user, enum scp_login_status *errorcode); * @param display_num Display number * @return 0 on success, 1 on failure * + * The resources allocated when the session is started are de-allocated + * by auth_end() - there is no separate way to do this. */ int auth_start_session(struct auth_info *auth_info, int display_num); -/** - * - * @brief Stops a session previously started with auth_start_session() - * @param auth_info. Auth handle created by auth_userpass - * @return 0 on success, 1 on failure - * - */ -int -auth_stop_session(struct auth_info *auth_info); - /** * * @brief Deallocates an auth handle and releases all resources diff --git a/sesman/libsesman/verify_user.c b/sesman/libsesman/verify_user.c index 43740a08..ccd289d2 100644 --- a/sesman/libsesman/verify_user.c +++ b/sesman/libsesman/verify_user.c @@ -180,14 +180,6 @@ auth_start_session(struct auth_info *auth_info, int display_num) return 0; } -/******************************************************************************/ -/* returns error */ -int -auth_stop_session(struct auth_info *auth_info) -{ - return 0; -} - /******************************************************************************/ int auth_end(struct auth_info *auth_info) diff --git a/sesman/libsesman/verify_user_kerberos.c b/sesman/libsesman/verify_user_kerberos.c index 3c6a9bc2..c2bde414 100644 --- a/sesman/libsesman/verify_user_kerberos.c +++ b/sesman/libsesman/verify_user_kerberos.c @@ -229,14 +229,6 @@ auth_start_session(struct auth_info *auth_info, int display_num) return 0; } -/******************************************************************************/ -/* returns error */ -int -auth_stop_session(struct auth_info *auth_info) -{ - return 0; -} - /******************************************************************************/ int auth_set_env(struct auth_info *auth_info) diff --git a/sesman/libsesman/verify_user_pam.c b/sesman/libsesman/verify_user_pam.c index 2a5ce8f8..9591d211 100644 --- a/sesman/libsesman/verify_user_pam.c +++ b/sesman/libsesman/verify_user_pam.c @@ -438,7 +438,7 @@ auth_start_session(struct auth_info *auth_info, int display_num) /******************************************************************************/ /* returns error */ -int +static int auth_stop_session(struct auth_info *auth_info) { int rv = 0; diff --git a/sesman/libsesman/verify_user_pam_userpass.c b/sesman/libsesman/verify_user_pam_userpass.c index 411931f5..2b6cf0fc 100644 --- a/sesman/libsesman/verify_user_pam_userpass.c +++ b/sesman/libsesman/verify_user_pam_userpass.c @@ -248,7 +248,7 @@ auth_start_session(struct auth_info *auth_info, int display_num) /******************************************************************************/ /* returns error */ -int +static int auth_stop_session(struct auth_info *auth_info) { int rv = 0; diff --git a/sesman/tools/authtest.c b/sesman/tools/authtest.c index 4a62ad10..48d8cca2 100644 --- a/sesman/tools/authtest.c +++ b/sesman/tools/authtest.c @@ -308,7 +308,6 @@ main(int argc, char **argv) rv = g_system(amp.command); LOG(LOG_LEVEL_INFO, "command \"%s\" returned %d", amp.command, rv); - auth_stop_session(auth_info); } } if (auth_info != NULL)