- (bal) "extration" -> "extraction" in ssh-rand-helper.c; repoted by john

[openssh.git] / auth-pam.c

diff --git a/auth-pam.c b/auth-pam.c
index 82cac286992cde7647a5948625317c9387fdcf8d..bc1af4663a007ec84ca2deedbcd2998ea962dbdf 100644 (file)
--- a/auth-pam.c
+++ b/auth-pam.c
@@ -276,6 +276,7 @@ static int
 sshpam_init(const char *user)
 {
        extern u_int utmp_len;
+       extern char *__progname;
        const char *pam_rhost, *pam_user;
 
        if (sshpam_handle != NULL) {
@@ -671,17 +672,19 @@ do_pam_chauthtok(void)
 int
 do_pam_putenv(char *name, char *value) 
 {
-       char *compound;
        int ret = 1;
-
 #ifdef HAVE_PAM_PUTENV 
-       compound = xmalloc(strlen(name)+strlen(value)+2);
-       if (compound) {
-               sprintf(compound,"%s=%s",name,value);
-               ret = pam_putenv(sshpam_handle,compound);
-               xfree(compound);
-       }
+       char *compound;
+       size_t len;
+
+       len = strlen(name) + strlen(value) + 2;
+       compound = xmalloc(len);
+
+       snprintf(compound, len, "%s=%s", name, value);
+       ret = pam_putenv(sshpam_handle, compound);
+       xfree(compound);
 #endif
+
        return (ret);
 }