src/usr.bin/ssh/auth-options.h - diff

Return to auth-options.h CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/auth-options.h between version 1.1.2.4 and 1.2

-version 1.1.2.4, 2001/03/21 18:52:32
+version 1.2, 2000/09/07 20:27:49
 Line 1
 Line 1
 Line 1
  /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
+  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-  *                    All rights reserved
-  * Functions to interface with the SSH_AUTHENTICATION_FD socket.
   *
-  * As far as I am concerned, the code I have written for this software
+  * Redistribution and use in source and binary forms, with or without
-  * can be used freely for any purpose.  Any derived versions of this
+  * modification, are permitted provided that the following conditions
-  * software must be clearly marked as such, and if the derived work is
+  * are met:
-  * incompatible with the protocol description in the RFC file, it must be
+  * 1. Redistributions of source code must retain the above copyright
-  * called by a name other than "ssh" or "Secure Shell".
+  *    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.
+  *
+  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
   */
- /* $OpenBSD$ */
  #ifndef AUTH_OPTIONS_H
  #define AUTH_OPTIONS_H
- /* Linked list of custom environment strings */
- struct envstring {
-         struct envstring *next;
-         char   *s;
- };
  /* Flags that may be set in authorized_keys options. */
  extern int no_port_forwarding_flag;
  extern int no_agent_forwarding_flag;
-Line 30
+Line 31
 Line 30
 Line 31
  extern char *forced_command;
  extern struct envstring *custom_environment;
- /*
+ /* return 1 if access is granted, 0 if not. side effect: sets key option flags */
-  * return 1 if access is granted, 0 if not.
+ int     auth_parse_options(struct passwd *pw, char *options, unsigned long linenum);
-  * side effect: sets key option flags
-  */
- int
- auth_parse_options(struct passwd *pw, char *options, char *file,
-     u_long linenum);
- /* reset options flags */
- void    auth_clear_options(void);
  #endif