Merge 4.2p1 to the trunk.

1 files changed, 26 insertions, 42 deletions

diff --git a/auth.c b/auth.c
index 46b013137..2dc5c2be6 100644
--- a/auth.c
+++ b/auth.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth.c,v 1.58 2005/03/14 11:44:42 dtucker Exp $");
+RCSID("$OpenBSD: auth.c,v 1.60 2005/06/17 02:44:32 djm Exp $");
 
 #ifdef HAVE_LOGIN_H
 #include <login.h>
@@ -76,7 +76,7 @@ allowed_user(struct passwd * pw)
         struct stat st;
         const char *hostname = NULL, *ipaddr = NULL, *passwd = NULL;
         char *shell;
-        int i;
+        u_int i;
 #ifdef USE_SHADOW
         struct spwd *spw = NULL;
 #endif
@@ -97,7 +97,11 @@ allowed_user(struct passwd * pw)
         /* grab passwd field for locked account check */
 #ifdef USE_SHADOW
         if (spw != NULL)
+#if defined(HAVE_LIBIAF)  &&  !defined(BROKEN_LIBIAF)
+                passwd = get_iaf_password(pw);
+#else
                 passwd = spw->sp_pwdp;
+#endif /* HAVE_LIBIAF  && !BROKEN_LIBIAF */
 #else
         passwd = pw->pw_passwd;
 #endif
@@ -119,6 +123,9 @@ allowed_user(struct passwd * pw)
                 if (strstr(passwd, LOCKED_PASSWD_SUBSTR))
                         locked = 1;
 #endif
+#if defined(HAVE_LIBIAF)  &&  !defined(BROKEN_LIBIAF)
+                free(passwd);
+#endif /* HAVE_LIBIAF  && !BROKEN_LIBIAF */
                 if (locked) {
                         logit("User %.100s not allowed because account is locked",
                             pw->pw_name);
@@ -326,64 +333,41 @@ auth_root_allowed(char *method)
  *
  * This returns a buffer allocated by xmalloc.
  */
-char *
-expand_filename(const char *filename, struct passwd *pw)
+static char *
+expand_authorized_keys(const char *filename, struct passwd *pw)
 {
-        Buffer buffer;
-        char *file;
-        const char *cp;
+        char *file, *ret;
 
-        /*
-         * Build the filename string in the buffer by making the appropriate
-         * substitutions to the given file name.
-         */
-        buffer_init(&buffer);
-        for (cp = filename; *cp; cp++) {
-                if (cp[0] == '%' && cp[1] == '%') {
-                        buffer_append(&buffer, "%", 1);
-                        cp++;
-                        continue;
-                }
-                if (cp[0] == '%' && cp[1] == 'h') {
-                        buffer_append(&buffer, pw->pw_dir, strlen(pw->pw_dir));
-                        cp++;
-                        continue;
-                }
-                if (cp[0] == '%' && cp[1] == 'u') {
-                        buffer_append(&buffer, pw->pw_name,
-                            strlen(pw->pw_name));
-                        cp++;
-                        continue;
-                }
-                buffer_append(&buffer, cp, 1);
-        }
-        buffer_append(&buffer, "\0", 1);
+        file = percent_expand(filename, "h", pw->pw_dir,
+            "u", pw->pw_name, (char *)NULL);
 
         /*
          * Ensure that filename starts anchored. If not, be backward
          * compatible and prepend the '%h/'
          */
-        file = xmalloc(MAXPATHLEN);
-        cp = buffer_ptr(&buffer);
-        if (*cp != '/')
-                snprintf(file, MAXPATHLEN, "%s/%s", pw->pw_dir, cp);
-        else
-                strlcpy(file, cp, MAXPATHLEN);
+        if (*file == '/')
+                return (file);
+
+        ret = xmalloc(MAXPATHLEN);
+        if (strlcpy(ret, pw->pw_dir, MAXPATHLEN) >= MAXPATHLEN ||
+            strlcat(ret, "/", MAXPATHLEN) >= MAXPATHLEN ||
+            strlcat(ret, file, MAXPATHLEN) >= MAXPATHLEN)
+                fatal("expand_authorized_keys: path too long");
 
-        buffer_free(&buffer);
-        return file;
+        xfree(file);
+        return (ret);
 }
 
 char *
 authorized_keys_file(struct passwd *pw)
 {
-        return expand_filename(options.authorized_keys_file, pw);
+        return expand_authorized_keys(options.authorized_keys_file, pw);
 }
 
 char *
 authorized_keys_file2(struct passwd *pw)
 {
-        return expand_filename(options.authorized_keys_file2, pw);
+        return expand_authorized_keys(options.authorized_keys_file2, pw);
 }
 
 /* return ok if key exists in sysfile or userfile */