[BACK]Return to anshd.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / ansh / src

Diff for /ansh/src/anshd.c between versions 1.1.1.1.2.3 and 1.1.1.1.2.5

version 1.1.1.1.2.3, 2011/10/10 13:56:30 version 1.1.1.1.2.5, 2011/10/14 09:04:04
Line 5 Line 5
  * $Author$   * $Author$
  * $Id$   * $Id$
  *   *
 *************************************************************************/ *************************************************************************
 The ELWIX and AITNET software is distributed under the following
 terms:
 
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
 Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
         by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
 are met:
 1. Redistributions of source code must retain the above copyright
    notice, this list of conditions and the following disclaimer.
 2. Redistributions in binary form must reproduce the above copyright
    notice, this list of conditions and the following disclaimer in the
    documentation and/or other materials provided with the distribution.
 3. All advertising materials mentioning features or use of this software
    must display the following acknowledgement:
 This product includes software developed by Michael Pounov <misho@elwix.org>
 ELWIX - Embedded LightWeight unIX and its contributors.
 4. Neither the name of AITNET nor the names of its contributors
    may be used to endorse or promote products derived from this software
    without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
 */
 #include "global.h"  #include "global.h"
 #include "anshd.h"  #include "anshd.h"
 #include "proc.h"  #include "proc.h"
Line 16  int Verbose; Line 53  int Verbose;
 u_int Crypted = 1;  u_int Crypted = 1;
 proc_head_t pH;  proc_head_t pH;
 int bpfLEN, Timeout, Daemon = 1;  int bpfLEN, Timeout, Daemon = 1;
   char Key[STRSIZ];
   
 extern char compiled[], compiledby[], compilehost[];  extern char compiled[], compiledby[], compilehost[];
   
Line 28  Usage() Line 66  Usage()
                 "\t-d <dev>\tBind to host interface, like 'em0' (default is first host interface)\n"                  "\t-d <dev>\tBind to host interface, like 'em0' (default is first host interface)\n"
                 "\t-U <user>\tRun service with other user\n"                  "\t-U <user>\tRun service with other user\n"
                 "\t-C <dir>\tRun service into chroot directory\n"                  "\t-C <dir>\tRun service into chroot directory\n"
                   "\t-k <key>\tService cipher key\n"
                 "\t-t <timeout>\tTimeout of login if no activity (default is 0 sec)\n"                  "\t-t <timeout>\tTimeout of login if no activity (default is 0 sec)\n"
                 "\t-u\t\tSwitch to unencrypted traffic between hosts\n"                  "\t-u\t\tSwitch to unencrypted traffic between hosts\n"
                 "\t-b\t\tRun into batch mode (default is daemon mode)\n"                  "\t-b\t\tRun into batch mode (default is daemon mode)\n"
Line 83  main(int argc, char **argv) Line 122  main(int argc, char **argv)
         sched_root_task_t *root = NULL;          sched_root_task_t *root = NULL;
         struct tagProc *proc;          struct tagProc *proc;
   
           strlcpy(Key, DEFAULT_KEY, sizeof Key);
   
         Get1stEth(szDev, STRSIZ);          Get1stEth(szDev, STRSIZ);
   
        while ((ch = getopt(argc, argv, "hvubt:d:U:C:")) != -1)        while ((ch = getopt(argc, argv, "hvubt:d:U:C:k:")) != -1)
                 switch (ch) {                  switch (ch) {
                         case 'U':                          case 'U':
                                 pass = getpwnam(optarg);                                  pass = getpwnam(optarg);
Line 111  main(int argc, char **argv) Line 152  main(int argc, char **argv)
                                 break;                                  break;
                         case 'd':                          case 'd':
                                 strlcpy(szDev, optarg, sizeof szDev);                                  strlcpy(szDev, optarg, sizeof szDev);
                                   break;
                           case 'k':
                                   strlcpy(Key, optarg, sizeof Key);
                                 break;                                  break;
                         case 'u':                          case 'u':
                                 Crypted ^= Crypted;                                  Crypted ^= Crypted;
Removed from v.1.1.1.1.2.3  
changed lines
  Added in v.1.1.1.1.2.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>