OpenPAM/OpenPAM
OpenPAM/OpenPAM
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Plug memory leak, reduce differences between these very similar

Browse source 
functions, and {add,tweak} documentation.

Sponsored by:	DARPA, NAI Labs


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@101 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2002-04-06 17:17:44 +00:00
parent 1eafe40ac3
commit c9f74afc91
2 changed files with 41 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/pam_get_authtok.c
View file

@ -31,11 +31,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $P4: //depot/projects/openpam/lib/pam_get_authtok.c#13 $ * $P4: //depot/projects/openpam/lib/pam_get_authtok.c#14 $
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <stdlib.h>
#include <security/pam_appl.h> #include <security/pam_appl.h>
#include <security/openpam.h> #include <security/openpam.h>
@ -95,8 +97,11 @@ pam_get_authtok(pam_handle_t *pamh,
r = pam_prompt(pamh, style, &resp, "%s", prompt); r = pam_prompt(pamh, style, &resp, "%s", prompt);
if (r != PAM_SUCCESS) if (r != PAM_SUCCESS)
return (r); return (r);
*authtok = resp; r = pam_set_item(pamh, pitem, resp);
return (pam_set_item(pamh, item, *authtok)); free(resp);
if (r != PAM_SUCCESS)
return (r);
return (pam_get_item(pamh, pitem, (const void **)authtok));
} }
/* /*
@ -124,9 +129,10 @@ pam_get_authtok(pam_handle_t *pamh,
* authentication tokens. * authentication tokens.
* *
* The =prompt argument specifies a prompt to use if no token is cached. * The =prompt argument specifies a prompt to use if no token is cached.
* If =NULL, the =PAM_AUTHTOK_PROMPT or =PAM_OLDAUTHTOK_PROMPT item, as * If it is =NULL, the =PAM_AUTHTOK_PROMPT or =PAM_OLDAUTHTOK_PROMPT item,
* appropriate, will be used. If that item is also =NULL, a hardcoded * as appropriate, will be used. If that item is also =NULL, a hardcoded
* default prompt will be used. * default prompt will be used.
* *
* >pam_get_item * >pam_get_item
* >pam_get_user
*/ */

39
lib/pam_get_user.c
View file

@ -31,16 +31,20 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $P4: //depot/projects/openpam/lib/pam_get_user.c#10 $ * $P4: //depot/projects/openpam/lib/pam_get_user.c#11 $
*/ */
#include <sys/param.h> #include <sys/param.h>
#include <stdlib.h>
#include <security/pam_appl.h> #include <security/pam_appl.h>
#include <security/openpam.h> #include <security/openpam.h>
#include "openpam_impl.h" #include "openpam_impl.h"
const char user_prompt[] = "Login:";
/* /*
* XSSO 4.2.1 * XSSO 4.2.1
* XSSO 6 page 52 * XSSO 6 page 52
@ -53,7 +57,7 @@ pam_get_user(pam_handle_t *pamh,
const char **user, const char **user,
const char *prompt) const char *prompt)
{ {
char *p, *resp; char *resp;
int r; int r;
if (pamh == NULL || user == NULL) if (pamh == NULL || user == NULL)
@ -63,16 +67,18 @@ pam_get_user(pam_handle_t *pamh,
if (r == PAM_SUCCESS) if (r == PAM_SUCCESS)
return (PAM_SUCCESS); return (PAM_SUCCESS);
if (prompt == NULL) { if (prompt == NULL) {
if (pam_get_item(pamh, PAM_USER_PROMPT, r = pam_get_item(pamh, PAM_USER_PROMPT, (const void **)&prompt);
(const void **)&p) != PAM_SUCCESS || p == NULL) if (r != PAM_SUCCESS || prompt == NULL)
prompt = "Login: "; prompt = user_prompt;
} }
r = pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &resp, r = pam_prompt(pamh, PAM_PROMPT_ECHO_ON, &resp, "%s", prompt);
"%s", prompt ? prompt : p);
if (r != PAM_SUCCESS) if (r != PAM_SUCCESS)
return (r); return (r);
*user = resp; r = pam_set_item(pamh, PAM_USER, resp);
return (pam_set_item(pamh, PAM_USER, *user)); free(resp);
if (r != PAM_SUCCESS)
return (r);
return (pam_get_item(pamh, PAM_USER, (const void **)user));
} }
/* /*
@ -83,3 +89,18 @@ pam_get_user(pam_handle_t *pamh,
* =pam_set_item * =pam_set_item
* !PAM_SYMBOL_ERR * !PAM_SYMBOL_ERR
*/ */
/**
* The =pam_get_user function returns the name of the target user, as
* specified to =pam_start. If no user was specified, nor set using
* =pam_set_item, =pam_get_user will prompt for a user name. Either way,
* a pointer to the user name is stored in the location pointed to by the
* =user argument.
* The =prompt argument specifies a prompt to use if no user name is
* cached. If it is =NULL, the =PAM_USER_PROMPT will be used. If that
* item is also =NULL, a hardcoded default prompt will be used.
*
* >pam_get_item
* >pam_get_authtok
*/