OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   23-Dec-2003 21:48:40
  Branch: HEAD                             Handle: 2003122320483802

  Modified files:
    openpkg-src/openssh     openssh.patch openssh.spec
    openpkg-web             news.txt

  Log:
    add chroot support also to sftp-server (actually a double-chroot if
    one uses a regular shell, but useful if one uses an own shell which
    manipulates HOME before calling sftp-server in order to trick it to do
    a delayed chroot(2) operation)

  Summary:
    Revision    Changes     Path
    1.6         +33 -0      openpkg-src/openssh/openssh.patch
    1.118       +1  -1      openpkg-src/openssh/openssh.spec
    1.7877      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/openssh/openssh.patch
  ============================================================================
  $ cvs diff -u -r1.5 -r1.6 openssh.patch
  --- openpkg-src/openssh/openssh.patch 4 Dec 2003 10:38:52 -0000       1.5
  +++ openpkg-src/openssh/openssh.patch 23 Dec 2003 20:48:40 -0000      1.6
  @@ -36,6 +36,39 @@
    # ifdef USE_PAM
                /*
                 * PAM credentials may take the form of supplementary groups. 
  +Index: sftp-server.c
  +--- sftp-server.c.orig       2003-08-22 01:34:41.000000000 +0200
  ++++ sftp-server.c    2003-12-23 21:42:19.000000000 +0100
  +@@ -1037,6 +1037,29 @@
  +     log_init("sftp-server", SYSLOG_LEVEL_DEBUG1, SYSLOG_FACILITY_AUTH, 0);
  + #endif
  + 
  ++#ifdef USE_CHROOT
  ++{
  ++            char *user_dir;
  ++            char *new_root;
  ++            user_dir = getenv("HOME");
  ++                    if (user_dir == NULL)
  ++                        fatal("HOME variable not found in environment");
  ++            new_root = user_dir + 1;
  ++            while ((new_root = strchr(new_root, '.')) != NULL) {
  ++                new_root--;
  ++                if (strncmp(new_root, "/./", 3) == 0) {
  ++                    *new_root = '\0';
  ++                    new_root += 2;
  ++                    if (chroot(user_dir) == -1)
  ++                        fatal("Couldn't chroot to user directory \"%s\"", 
user_dir);
  ++                                    setenv("HOME", new_root, 1);
  ++                    break;
  ++                }
  ++                new_root += 2;
  ++            }
  ++}
  ++#endif /* USE_CHROOT */
  ++
  +     in = dup(STDIN_FILENO);
  +     out = dup(STDOUT_FILENO);
  + 
   Index: auth-pam.h
   --- auth-pam.h.orig  2003-09-02 15:18:53.000000000 +0200
   +++ auth-pam.h       2003-09-27 12:29:28.000000000 +0200
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/openssh/openssh.spec
  ============================================================================
  $ cvs diff -u -r1.117 -r1.118 openssh.spec
  --- openpkg-src/openssh/openssh.spec  4 Dec 2003 10:38:52 -0000       1.117
  +++ openpkg-src/openssh/openssh.spec  23 Dec 2003 20:48:40 -0000      1.118
  @@ -41,7 +41,7 @@
   Group:        Security
   License:      BSD
   Version:      %{V_base}%{V_portable}
  -Release:      20031204
  +Release:      20031223
   
   #   package options
   %option       with_fsl      yes
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7876 -r1.7877 news.txt
  --- openpkg-web/news.txt      23 Dec 2003 18:56:34 -0000      1.7876
  +++ openpkg-web/news.txt      23 Dec 2003 20:48:38 -0000      1.7877
  @@ -1,3 +1,4 @@
  +23-Dec-2003: Upgraded package: P<openssh-3.7.1p2-20031223>
   23-Dec-2003: Upgraded package: P<perl-ds-20031223-20031223>
   23-Dec-2003: Upgraded package: P<file-4.07-20031223>
   23-Dec-2003: Upgraded package: P<ripe-dbase-3.2.0-20031223>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to