===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/auth.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- src/usr.bin/ssh/auth.c	2010/01/13 00:19:04	1.82
+++ src/usr.bin/ssh/auth.c	2010/01/13 23:47:26	1.83
@@ -1,4 +1,4 @@
-/* $OpenBSD: auth.c,v 1.82 2010/01/13 00:19:04 dtucker Exp $ */
+/* $OpenBSD: auth.c,v 1.83 2010/01/13 23:47:26 djm Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -79,7 +79,7 @@
 {
 	struct stat st;
 	const char *hostname = NULL, *ipaddr = NULL;
-	char *shell;
+	char *shell, *tmp, *chroot_path;
 	u_int i;
 
 	/* Shouldn't be called if pw is NULL, but better safe than sorry... */
@@ -90,20 +90,40 @@
 	 * Get the shell from the password data.  An empty shell field is
 	 * legal, and means /bin/sh.
 	 */
-	shell = (pw->pw_shell[0] == '\0') ? _PATH_BSHELL : pw->pw_shell;
+	shell = xstrdup((pw->pw_shell[0] == '\0') ?
+	    _PATH_BSHELL : pw->pw_shell);
 
+	/*
+	 * Amend shell if chroot is requested.
+	 */
+	if (options.chroot_directory != NULL &&
+	    strcasecmp(options.chroot_directory, "none") != 0) {
+		tmp = tilde_expand_filename(options.chroot_directory,
+		    pw->pw_uid);
+		chroot_path = percent_expand(tmp, "h", pw->pw_dir,
+		    "u", pw->pw_name, (char *)NULL);
+		xfree(tmp);
+		xasprintf(&tmp, "%s/%s", chroot_path, shell);
+		xfree(shell);
+		shell = tmp;
+		free(chroot_path);
+	}
+
 	/* deny if shell does not exists or is not executable */
 	if (stat(shell, &st) != 0) {
 		logit("User %.100s not allowed because shell %.100s does not exist",
 		    pw->pw_name, shell);
+		xfree(shell);
 		return 0;
 	}
 	if (S_ISREG(st.st_mode) == 0 ||
 	    (st.st_mode & (S_IXOTH|S_IXUSR|S_IXGRP)) == 0) {
 		logit("User %.100s not allowed because shell %.100s is not executable",
 		    pw->pw_name, shell);
+		xfree(shell);
 		return 0;
 	}
+	xfree(shell);
 
 	if (options.num_deny_users > 0 || options.num_allow_users > 0 ||
 	    options.num_deny_groups > 0 || options.num_allow_groups > 0) {